diff options
author | Zsolt Vasvari <zsoltvas@mamedev.org> | 2008-03-08 15:57:43 +0000 |
---|---|---|
committer | Zsolt Vasvari <zsoltvas@mamedev.org> | 2008-03-08 15:57:43 +0000 |
commit | 48f7d189e6a36346c37840f765dd9994fd78b479 (patch) | |
tree | 0bdd19bfd2dfa9ef08523788f41eba955d3dcab3 | |
parent | 8f318637d9c07e5725b278739df07de11a2e3671 (diff) |
Changes VIDEO_UPDATE signature to
typedef UINT32 (*video_update_func)(const device_config *screen, int scrnum, bitmap_t *bitmap, const rectangle *cliprect);
Adds const device_config *primary_screen to running_machine (not yet used)
683 files changed, 2509 insertions, 2585 deletions
diff --git a/src/emu/cpu/tms34010/tms34010.c b/src/emu/cpu/tms34010/tms34010.c index 5224e38aaab..cee18854f19 100644 --- a/src/emu/cpu/tms34010/tms34010.c +++ b/src/emu/cpu/tms34010/tms34010.c @@ -1110,19 +1110,19 @@ void tms34010_get_display_params(int cpunum, tms34010_display_params *params) VIDEO_UPDATE( tms340x0 ) { - pen_t blackpen = get_black_pen(machine); + pen_t blackpen = get_black_pen(screen->machine); tms34010_display_params params; int x; /* get the display parameters for the screen */ - tms34010_get_display_params(screen_to_cpu[screen], ¶ms); + tms34010_get_display_params(screen_to_cpu[scrnum], ¶ms); /* if the display is enabled, call the scanline callback */ if (params.enabled) { /* call through to the callback */ LOG((" Update: scan=%3d ROW=%04X COL=%04X\n", cliprect->min_y, params.rowaddr, params.coladdr)); - (*state.config->scanline_callback)(machine, screen, bitmap, cliprect->min_y, ¶ms); + (*state.config->scanline_callback)(screen->machine, scrnum, bitmap, cliprect->min_y, ¶ms); } /* otherwise, just blank the current scanline */ diff --git a/src/emu/driver.h b/src/emu/driver.h index be19dbc8cc2..0470f22c961 100644 --- a/src/emu/driver.h +++ b/src/emu/driver.h @@ -19,6 +19,7 @@ MACROS (must be *before* the includes below) ***************************************************************************/ +#include "devintrf.h" #include "mamecore.h" #define DRIVER_INIT(name) void driver_init_##name(running_machine *machine) @@ -54,8 +55,8 @@ #define VIDEO_EOF(name) void video_eof_##name(running_machine *machine) #define VIDEO_EOF_CALL(name) video_eof_##name(machine) -#define VIDEO_UPDATE(name) UINT32 video_update_##name(running_machine *machine, int screen, bitmap_t *bitmap, const rectangle *cliprect) -#define VIDEO_UPDATE_CALL(name) video_update_##name(machine, screen, bitmap, cliprect) +#define VIDEO_UPDATE(name) UINT32 video_update_##name(const device_config *screen, int scrnum, bitmap_t *bitmap, const rectangle *cliprect) +#define VIDEO_UPDATE_CALL(name) video_update_##name(screen, scrnum, bitmap, cliprect) /* NULL versions */ @@ -72,18 +73,18 @@ #define video_update_NULL NULL -typedef void (*driver_init_func)(running_machine *machine); -typedef void (*nvram_handler_func)(running_machine *machine, mame_file *file, int read_or_write); -typedef void (*memcard_handler_func)(running_machine *machine, mame_file *file, int action); -typedef void (*machine_start_func)(running_machine *machine); -typedef void (*machine_reset_func)(running_machine *machine); -typedef void (*sound_start_func)(running_machine *machine); -typedef void (*sound_reset_func)(running_machine *machine); -typedef void (*video_start_func)(running_machine *machine); -typedef void (*video_reset_func)(running_machine *machine); -typedef void (*palette_init_func)(running_machine *machine, const UINT8 *color_prom); -typedef void (*video_eof_func)(running_machine *machine); -typedef UINT32 (*video_update_func)(running_machine *machine, int screen, bitmap_t *bitmap, const rectangle *cliprect); +typedef void (*driver_init_func)(running_machine *machine); +typedef void (*nvram_handler_func)(running_machine *machine, mame_file *file, int read_or_write); +typedef void (*memcard_handler_func)(running_machine *machine, mame_file *file, int action); +typedef void (*machine_start_func)(running_machine *machine); +typedef void (*machine_reset_func)(running_machine *machine); +typedef void (*sound_start_func)(running_machine *machine); +typedef void (*sound_reset_func)(running_machine *machine); +typedef void (*video_start_func)(running_machine *machine); +typedef void (*video_reset_func)(running_machine *machine); +typedef void (*palette_init_func)(running_machine *machine, const UINT8 *color_prom); +typedef void (*video_eof_func)(running_machine *machine); +typedef UINT32 (*video_update_func)(const device_config *screen, int scrnum, bitmap_t *bitmap, const rectangle *cliprect); @@ -93,7 +94,6 @@ typedef UINT32 (*video_update_func)(running_machine *machine, int screen, bitmap #include "cpuintrf.h" #include "sndintrf.h" -#include "devintrf.h" #include "fileio.h" #include "drawgfx.h" #include "emupal.h" diff --git a/src/emu/mame.h b/src/emu/mame.h index 2d73e5f6c81..46550f8aa57 100644 --- a/src/emu/mame.h +++ b/src/emu/mame.h @@ -178,7 +178,8 @@ struct _running_machine /* video-related information */ gfx_element * gfx[MAX_GFX_ELEMENTS];/* array of pointers to graphic sets (chars, sprites) */ - screen_state screen[MAX_SCREENS];/* current screen state */ + screen_state screen[MAX_SCREENS];/* current screen state (to go away) */ + const device_config * primary_screen; /* the primary screen device, or NULL if screenless */ palette_t * palette; /* global palette object */ /* palette-related information */ diff --git a/src/emu/mconfig.h b/src/emu/mconfig.h index f968f1424f0..5d23146ea70 100644 --- a/src/emu/mconfig.h +++ b/src/emu/mconfig.h @@ -117,36 +117,36 @@ enum /* In mamecore.h: typedef struct _machine_config machine_config; */ struct _machine_config { - UINT32 driver_data_size; /* amount of memory needed for driver_data */ + UINT32 driver_data_size; /* amount of memory needed for driver_data */ - cpu_config cpu[MAX_CPU]; /* array of CPUs in the system */ - UINT32 cpu_slices_per_frame; /* number of times to interleave execution per frame */ - INT32 watchdog_vblank_count; /* number of VBLANKs until the watchdog kills us */ - attotime watchdog_time; /* length of time until the watchdog kills us */ + cpu_config cpu[MAX_CPU]; /* array of CPUs in the system */ + UINT32 cpu_slices_per_frame; /* number of times to interleave execution per frame */ + INT32 watchdog_vblank_count; /* number of VBLANKs until the watchdog kills us */ + attotime watchdog_time; /* length of time until the watchdog kills us */ - void (*machine_start)(running_machine *machine); /* one-time machine start callback */ - void (*machine_reset)(running_machine *machine); /* machine reset callback */ + machine_start_func machine_start; /* one-time machine start callback */ + machine_reset_func machine_reset; /* machine reset callback */ - void (*nvram_handler)(running_machine *machine, mame_file *file, int read_or_write); /* NVRAM save/load callback */ - void (*memcard_handler)(running_machine *machine, mame_file *file, int action); /* memory card save/load callback */ + nvram_handler_func nvram_handler; /* NVRAM save/load callback */ + memcard_handler_func memcard_handler; /* memory card save/load callback */ - UINT32 video_attributes; /* flags describing the video system */ + UINT32 video_attributes; /* flags describing the video system */ const gfx_decode_entry *gfxdecodeinfo; /* pointer to array of graphics decoding information */ - UINT32 total_colors; /* total number of colors in the palette */ - const char * default_layout; /* default layout for this machine */ + UINT32 total_colors; /* total number of colors in the palette */ + const char * default_layout; /* default layout for this machine */ - void (*init_palette)(running_machine *machine, const UINT8 *color_prom); /* one-time palette init callback */ - void (*video_start)(running_machine *machine); /* one-time video start callback */ - void (*video_reset)(running_machine *machine); /* video reset callback */ - void (*video_eof)(running_machine *machine); /* end-of-frame video callback */ - UINT32 (*video_update)(running_machine *machine, int screen, bitmap_t *bitmap, const rectangle *cliprect); /* video update callback */ + palette_init_func init_palette; /* one-time palette init callback */ + video_start_func video_start; /* one-time video start callback */ + sound_reset_func video_reset; /* video reset callback */ + video_eof_func video_eof; /* end-of-frame video callback */ + video_update_func video_update; /* video update callback */ - sound_config sound[MAX_SOUND]; /* array of sound chips in the system */ + sound_config sound[MAX_SOUND]; /* array of sound chips in the system */ - void (*sound_start)(running_machine *machine); /* one-time sound start callback */ - void (*sound_reset)(running_machine *machine); /* sound reset callback */ + sound_start_func sound_start; /* one-time sound start callback */ + sound_reset_func sound_reset; /* sound reset callback */ - device_config * devicelist; /* list head for devices */ + device_config * devicelist; /* list head for devices */ }; diff --git a/src/emu/video.c b/src/emu/video.c index 669479484b6..150563d0c7b 100644 --- a/src/emu/video.c +++ b/src/emu/video.c @@ -314,6 +314,9 @@ void video_init(running_machine *machine) /* request a callback upon exiting */ add_exit_callback(machine, video_exit); + /* set the first screen device as the primary - this will set NULL if screenless */ + machine->primary_screen = video_screen_first(machine->config); + for (device = video_screen_first(machine->config); device != NULL; device = video_screen_next(device)) { char unique_tag[40]; @@ -889,7 +892,7 @@ void video_screen_update_partial(int scrnum, int scanline) LOG_PARTIAL_UPDATES(("updating %d-%d\n", clip.min_y, clip.max_y)); if (Machine->config->video_update != NULL) - flags = (*Machine->config->video_update)(Machine, scrnum, internal_state->bitmap[internal_state->curbitmap], &clip); + flags = (*Machine->config->video_update)(internal_state->device, scrnum, internal_state->bitmap[internal_state->curbitmap], &clip); global.partial_updates_this_frame++; profiler_mark(PROFILER_END); diff --git a/src/emu/video/cdp1869.c b/src/emu/video/cdp1869.c index 30a41fc2315..3ecae4ea98b 100644 --- a/src/emu/video/cdp1869.c +++ b/src/emu/video/cdp1869.c @@ -479,13 +479,13 @@ VIDEO_START( cdp1869 ) VIDEO_UPDATE( cdp1869 ) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); if (!cdp1869.dispoff) { int sx, sy, rows, cols, width, height; UINT16 addr, pmemsize; - rectangle screen, outer; + rectangle screen_rect, outer; switch (cdp1869.ntsc_pal) { @@ -494,10 +494,10 @@ VIDEO_UPDATE( cdp1869 ) outer.max_x = CDP1869_HBLANK_START - 1; outer.min_y = CDP1869_SCANLINE_VBLANK_END_NTSC; outer.max_y = CDP1869_SCANLINE_VBLANK_START_NTSC - 1; - screen.min_x = CDP1869_SCREEN_START_NTSC; - screen.max_x = CDP1869_SCREEN_END - 1; - screen.min_y = CDP1869_SCANLINE_DISPLAY_START_NTSC; - screen.max_y = CDP1869_SCANLINE_DISPLAY_END_NTSC - 1; + screen_rect.min_x = CDP1869_SCREEN_START_NTSC; + screen_rect.max_x = CDP1869_SCREEN_END - 1; + screen_rect.min_y = CDP1869_SCANLINE_DISPLAY_START_NTSC; + screen_rect.max_y = CDP1869_SCANLINE_DISPLAY_END_NTSC - 1; break; default: @@ -506,15 +506,15 @@ VIDEO_UPDATE( cdp1869 ) outer.max_x = CDP1869_HBLANK_START - 1; outer.min_y = CDP1869_SCANLINE_VBLANK_END_PAL; outer.max_y = CDP1869_SCANLINE_VBLANK_START_PAL - 1; - screen.min_x = CDP1869_SCREEN_START_PAL; - screen.max_x = CDP1869_SCREEN_END - 1; - screen.min_y = CDP1869_SCANLINE_DISPLAY_START_PAL; - screen.max_y = CDP1869_SCANLINE_DISPLAY_END_PAL - 1; + screen_rect.min_x = CDP1869_SCREEN_START_PAL; + screen_rect.max_x = CDP1869_SCREEN_END - 1; + screen_rect.min_y = CDP1869_SCANLINE_DISPLAY_START_PAL; + screen_rect.max_y = CDP1869_SCANLINE_DISPLAY_END_PAL - 1; break; } sect_rect(&outer, cliprect); - fillbitmap(bitmap, machine->pens[cdp1869.bkg], &outer); + fillbitmap(bitmap, screen->machine->pens[cdp1869.bkg], &outer); width = CDP1869_CHAR_WIDTH; height = cdp1869_get_lines(); @@ -530,7 +530,7 @@ VIDEO_UPDATE( cdp1869 ) } cols = cdp1869.freshorz ? CDP1869_COLUMNS_FULL : CDP1869_COLUMNS_HALF; - rows = (screen.max_y - screen.min_y + 1) / height; + rows = (screen_rect.max_y - screen_rect.min_y + 1) / height; pmemsize = cdp1869_get_pmemsize(cols, rows); @@ -543,7 +543,7 @@ VIDEO_UPDATE( cdp1869 ) int x = sx * width; int y = sy * height; - cdp1869_draw_char(machine, bitmap, x, y, addr, &screen); + cdp1869_draw_char(screen->machine, bitmap, x, y, addr, &screen_rect); addr++; diff --git a/src/emu/video/tms9928a.c b/src/emu/video/tms9928a.c index c1fb5ca0969..e7e0d7baad6 100644 --- a/src/emu/video/tms9928a.c +++ b/src/emu/video/tms9928a.c @@ -390,13 +390,13 @@ void TMS9928A_set_spriteslimit (int limit) { VIDEO_UPDATE( tms9928a ) { INT32 BackColour = tms.Regs[7] & 15; if (!BackColour) BackColour=1; - palette_set_color(machine, 0, TMS9928A_palette[BackColour]); + palette_set_color(screen->machine, 0, TMS9928A_palette[BackColour]); if (! (tms.Regs[1] & 0x40)) - fillbitmap(bitmap, machine->pens[BackColour], cliprect); + fillbitmap(bitmap, screen->machine->pens[BackColour], cliprect); else { - (*ModeHandlers[TMS_MODE])(machine, tms.tmpbmp, cliprect); + (*ModeHandlers[TMS_MODE])(screen->machine, tms.tmpbmp, cliprect); copybitmap(bitmap, tms.tmpbmp, 0, 0, LEFT_BORDER, TOP_BORDER, cliprect); { @@ -416,7 +416,7 @@ VIDEO_UPDATE( tms9928a ) fillbitmap (bitmap, BackColour, &rt); } if (TMS_SPRITES_ENABLED) - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); } return 0; diff --git a/src/emu/video/vector.c b/src/emu/video/vector.c index df4d2ac6bb7..a042280527f 100644 --- a/src/emu/video/vector.c +++ b/src/emu/video/vector.c @@ -259,10 +259,10 @@ void vector_clear_list (void) VIDEO_UPDATE( vector ) { UINT32 flags = PRIMFLAG_ANTIALIAS(options_get_bool(mame_options(), OPTION_ANTIALIAS) ? 1 : 0) | PRIMFLAG_BLENDMODE(BLENDMODE_ADD); - float xscale = 1.0f / (65536 * (machine->screen[screen].visarea.max_x - machine->screen[screen].visarea.min_x)); - float yscale = 1.0f / (65536 * (machine->screen[screen].visarea.max_y - machine->screen[screen].visarea.min_y)); - float xoffs = (float)machine->screen[screen].visarea.min_x; - float yoffs = (float)machine->screen[screen].visarea.min_y; + float xscale = 1.0f / (65536 * (screen->machine->screen[scrnum].visarea.max_x - screen->machine->screen[scrnum].visarea.min_x)); + float yscale = 1.0f / (65536 * (screen->machine->screen[scrnum].visarea.max_y - screen->machine->screen[scrnum].visarea.min_y)); + float xoffs = (float)screen->machine->screen[scrnum].visarea.min_x; + float yoffs = (float)screen->machine->screen[scrnum].visarea.min_y; point *curpoint; render_bounds clip; int lastx = 0, lasty = 0; @@ -270,8 +270,8 @@ VIDEO_UPDATE( vector ) curpoint = vector_list; - render_container_empty(render_container_get_screen(screen)); - render_screen_add_rect(screen, 0.0f, 0.0f, 1.0f, 1.0f, MAKE_ARGB(0xff,0x00,0x00,0x00), PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA)); + render_container_empty(render_container_get_screen(scrnum)); + render_screen_add_rect(scrnum, 0.0f, 0.0f, 1.0f, 1.0f, MAKE_ARGB(0xff,0x00,0x00,0x00), PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA)); clip.x0 = clip.y0 = 0.0f; clip.x1 = clip.y1 = 1.0f; @@ -301,7 +301,7 @@ VIDEO_UPDATE( vector ) if (curpoint->intensity != 0) if (!render_clip_line(&coords, &clip)) - render_screen_add_line(screen, coords.x0, coords.y0, coords.x1, coords.y1, + render_screen_add_line(scrnum, coords.x0, coords.y0, coords.x1, coords.y1, beam_width * (1.0f / (float)VECTOR_WIDTH_DENOM), (curpoint->intensity << 24) | (curpoint->col & 0xffffff), flags); diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c index 92a6cc4cceb..60f827d1baf 100644 --- a/src/mame/drivers/1945kiii.c +++ b/src/mame/drivers/1945kiii.c @@ -106,7 +106,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta static VIDEO_UPDATE(k3) { tilemap_draw(bitmap,cliprect,k3_bg_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c index f2c1db72e43..c69423a4dc9 100644 --- a/src/mame/drivers/2mindril.c +++ b/src/mame/drivers/2mindril.c @@ -69,7 +69,7 @@ static UINT16 *textram; { \ UINT16 data0=map[y*128+x*2]; \ UINT16 data1=map[y*128+x*2+1]; \ - drawgfx(bitmap,machine->gfx[0], data1, \ + drawgfx(bitmap,screen->machine->gfx[0], data1, \ data0&0xff, \ data0&0x4000, data0&0x8000, \ x*16-512/*+(((INT16)(unkram[0x60000/2+num]))/32)*/, y*16/*+(((INT16)(unkram[0x60008/2+num]))/32)*/, \ @@ -84,7 +84,7 @@ static VIDEO_UPDATE( drill ) for (i=0; i<256; i++) { - decodechar(machine->gfx[1],i,(UINT8*)&charram[0]); + decodechar(screen->machine->gfx[1],i,(UINT8*)&charram[0]); } DRAW_MAP(map1ram,0) @@ -99,7 +99,7 @@ static VIDEO_UPDATE( drill ) for(x=0;x<64;x++) { drawgfx( bitmap, - machine->gfx[1], + screen->machine->gfx[1], textram[y*64+x]&0xff, //1ff ?? ((textram[y*64+x]>>9)&0xf), 0, 0, diff --git a/src/mame/drivers/ace.c b/src/mame/drivers/ace.c index 64292de5471..9c4a68c0f49 100644 --- a/src/mame/drivers/ace.c +++ b/src/mame/drivers/ace.c @@ -64,34 +64,34 @@ static VIDEO_UPDATE( ace ) { int offs; - decodechar(machine->gfx[1], 0, ace_characterram); - decodechar(machine->gfx[2], 0, ace_characterram); - decodechar(machine->gfx[3], 0, ace_characterram); + decodechar(screen->machine->gfx[1], 0, ace_characterram); + decodechar(screen->machine->gfx[2], 0, ace_characterram); + decodechar(screen->machine->gfx[3], 0, ace_characterram); for (offs = 0; offs < 8; offs++) { - decodechar(machine->gfx[4], offs, ace_scoreram); + decodechar(screen->machine->gfx[4], offs, ace_scoreram); } /* first of all, fill the screen with the background color */ fillbitmap(bitmap, 0, cliprect); - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], 0, 0, 0,0, objpos[0],objpos[1], cliprect,TRANSPARENCY_NONE,0); - drawgfx(bitmap,machine->gfx[2], + drawgfx(bitmap,screen->machine->gfx[2], 0, 0, 0,0, objpos[2],objpos[3], cliprect,TRANSPARENCY_NONE,0); - drawgfx(bitmap,machine->gfx[3], + drawgfx(bitmap,screen->machine->gfx[3], 0, 0, 0,0, @@ -100,7 +100,7 @@ static VIDEO_UPDATE( ace ) for (offs = 0; offs < 8; offs++) { - drawgfx(bitmap,machine->gfx[4], + drawgfx(bitmap,screen->machine->gfx[4], offs, 0, 0,0, diff --git a/src/mame/drivers/acefruit.c b/src/mame/drivers/acefruit.c index f5ab535912f..6ae2b3fe7ee 100644 --- a/src/mame/drivers/acefruit.c +++ b/src/mame/drivers/acefruit.c @@ -78,7 +78,7 @@ static VIDEO_UPDATE( acefruit ) if( color < 0x4 ) { - drawgfx( bitmap, machine->gfx[ 1 ], code, color, 0, 0, col * 16, row * 8, cliprect, TRANSPARENCY_NONE, 0 ); + drawgfx( bitmap, screen->machine->gfx[ 1 ], code, color, 0, 0, col * 16, row * 8, cliprect, TRANSPARENCY_NONE, 0 ); } else if( color >= 0x5 && color <= 0x7 ) { @@ -86,7 +86,7 @@ static VIDEO_UPDATE( acefruit ) int x; static const int spriteskip[] = { 1, 2, 4 }; int spritesize = spriteskip[ color - 5 ]; - const gfx_element *gfx = machine->gfx[ 0 ]; + const gfx_element *gfx = screen->machine->gfx[ 0 ]; for( x = 0; x < 16; x++ ) { diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c index c2cf9871930..0035d5136b9 100644 --- a/src/mame/drivers/acommand.c +++ b/src/mame/drivers/acommand.c @@ -215,7 +215,7 @@ static UINT16 led0; static VIDEO_UPDATE( acommand ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect,0,0); + draw_sprites(screen->machine,bitmap,cliprect,0,0); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); #if SHOW_LEDS diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c index 3f47cf7fa2a..6f5bdb06571 100644 --- a/src/mame/drivers/alg.c +++ b/src/mame/drivers/alg.c @@ -111,13 +111,13 @@ static VIDEO_UPDATE( alg ) /* update the Amiga video */ for (y = cliprect->min_y; y <= cliprect->max_y; y++) - amiga_render_scanline(machine, amiga_bitmap, y); + amiga_render_scanline(screen->machine, amiga_bitmap, y); /* at the end of the frame, composite the video */ - if (!video_skip_this_frame() && (cliprect->max_y == machine->screen[screen].visarea.max_y)) + if (!video_skip_this_frame() && (cliprect->max_y == screen->machine->screen[scrnum].visarea.max_y)) { bitmap_t *vidbitmap; - rectangle fixedvis = machine->screen[screen].visarea; + rectangle fixedvis = screen->machine->screen[scrnum].visarea; fixedvis.max_x++; fixedvis.max_y++; @@ -133,9 +133,9 @@ static VIDEO_UPDATE( alg ) render_texture_set_bitmap(overlay_texture, amiga_bitmap, &fixedvis, 0, TEXFORMAT_PALETTEA16); /* add both quads to the screen */ - render_container_empty(render_container_get_screen(screen)); - render_screen_add_quad(screen, 0.0f, 0.0f, 1.0f, 1.0f, MAKE_ARGB(0xff,0xff,0xff,0xff), video_texture, PRIMFLAG_BLENDMODE(BLENDMODE_NONE) | PRIMFLAG_SCREENTEX(1)); - render_screen_add_quad(screen, 0.0f, 0.0f, 1.0f, 1.0f, MAKE_ARGB(0xff,0xff,0xff,0xff), overlay_texture, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA) | PRIMFLAG_SCREENTEX(1)); + render_container_empty(render_container_get_screen(scrnum)); + render_screen_add_quad(scrnum, 0.0f, 0.0f, 1.0f, 1.0f, MAKE_ARGB(0xff,0xff,0xff,0xff), video_texture, PRIMFLAG_BLENDMODE(BLENDMODE_NONE) | PRIMFLAG_SCREENTEX(1)); + render_screen_add_quad(scrnum, 0.0f, 0.0f, 1.0f, 1.0f, MAKE_ARGB(0xff,0xff,0xff,0xff), overlay_texture, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA) | PRIMFLAG_SCREENTEX(1)); /* display disc information */ if (discinfo != NULL) diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c index dfeaff77dee..31a49a6851b 100644 --- a/src/mame/drivers/backfire.c +++ b/src/mame/drivers/backfire.c @@ -178,7 +178,7 @@ static VIDEO_UPDATE(backfire) deco16_pf12_update(deco16_pf1_rowscroll,deco16_pf2_rowscroll); deco16_pf34_update(deco16_pf3_rowscroll,deco16_pf4_rowscroll); - if (screen==0) + if (scrnum==0) { fillbitmap(priority_bitmap,0,NULL); @@ -188,20 +188,20 @@ static VIDEO_UPDATE(backfire) { deco16_tilemap_3_draw(bitmap,cliprect,0,1); deco16_tilemap_1_draw(bitmap,cliprect,0,2); - draw_sprites(machine,bitmap,cliprect,backfire_spriteram32_1,3); + draw_sprites(screen->machine,bitmap,cliprect,backfire_spriteram32_1,3); } else if (backfire_left_priority[0] == 2) { deco16_tilemap_1_draw(bitmap,cliprect,0,2); deco16_tilemap_3_draw(bitmap,cliprect,0,4); - draw_sprites(machine,bitmap,cliprect,backfire_spriteram32_1,3); + draw_sprites(screen->machine,bitmap,cliprect,backfire_spriteram32_1,3); } else { popmessage( "unknown left priority %08x", backfire_left_priority[0] ); } } - else if (screen==1) + else if (scrnum==1) { fillbitmap(priority_bitmap,0,NULL); fillbitmap(bitmap,0x500,cliprect); @@ -210,13 +210,13 @@ static VIDEO_UPDATE(backfire) { deco16_tilemap_4_draw(bitmap,cliprect,0,1); deco16_tilemap_2_draw(bitmap,cliprect,0,2); - draw_sprites(machine,bitmap,cliprect,backfire_spriteram32_2,4); + draw_sprites(screen->machine,bitmap,cliprect,backfire_spriteram32_2,4); } else if (backfire_right_priority[0] == 2) { deco16_tilemap_2_draw(bitmap,cliprect,0,2); deco16_tilemap_4_draw(bitmap,cliprect,0,4); - draw_sprites(machine,bitmap,cliprect,backfire_spriteram32_2,4); + draw_sprites(screen->machine,bitmap,cliprect,backfire_spriteram32_2,4); } else { diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c index 3f847c4c7eb..5a559fbbfc3 100644 --- a/src/mame/drivers/bestleag.c +++ b/src/mame/drivers/bestleag.c @@ -153,7 +153,7 @@ static VIDEO_UPDATE(bestleag) tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; } diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c index 77059d01763..97e77ee7227 100644 --- a/src/mame/drivers/bfcobra.c +++ b/src/mame/drivers/bfcobra.c @@ -254,8 +254,8 @@ static VIDEO_UPDATE( bfcobra ) UINT8 x_offset = x + h_scroll; UINT8 pen = *(src + x_offset); - //*dest++ = machine->pens[pen & ramdac.mask]; - *dest++ = machine->pens[pen]; + //*dest++ = screen->machine->pens[pen & ramdac.mask]; + *dest++ = screen->machine->pens[pen]; } } diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c index 70d3661a3bc..e8de3bc467f 100644 --- a/src/mame/drivers/bigfghtr.c +++ b/src/mame/drivers/bigfghtr.c @@ -256,14 +256,14 @@ static VIDEO_UPDATE( bigfghtr ) } else { - fillbitmap( bitmap, get_black_pen(machine), cliprect ); + fillbitmap( bitmap, get_black_pen(screen->machine), cliprect ); } - if( sprite_enable ) draw_sprites(machine, bitmap, cliprect, 2 ); + if( sprite_enable ) draw_sprites(screen->machine, bitmap, cliprect, 2 ); tilemap_draw( bitmap, cliprect, fg_tilemap, 0, 0); - if( sprite_enable ) draw_sprites(machine, bitmap, cliprect, 1 ); + if( sprite_enable ) draw_sprites(screen->machine, bitmap, cliprect, 1 ); tilemap_draw( bitmap, cliprect, tx_tilemap, 0, 0); - if( sprite_enable ) draw_sprites(machine, bitmap, cliprect, 0 ); + if( sprite_enable ) draw_sprites(screen->machine, bitmap, cliprect, 0 ); return 0; } diff --git a/src/mame/drivers/bishjan.c b/src/mame/drivers/bishjan.c index d2d56c5683b..4b1a6ba6065 100644 --- a/src/mame/drivers/bishjan.c +++ b/src/mame/drivers/bishjan.c @@ -108,7 +108,7 @@ if (input_code_pressed(KEYCODE_Z)) tilemap_set_scrollx( tmap1, 0, scroll1_x); tilemap_set_scrolly( tmap1, 0, scroll1_y ); tilemap_set_scrollx( tmap2, 0, scroll2_x); tilemap_set_scrolly( tmap2, 0, scroll2_y ); - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect, tmap1, 0, 0); if (layers_ctrl & 2) tilemap_draw(bitmap,cliprect, tmap2, 0, 0); diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c index fe1dcab6691..5d86b1dcf94 100644 --- a/src/mame/drivers/bmcbowl.c +++ b/src/mame/drivers/bmcbowl.c @@ -132,7 +132,7 @@ static VIDEO_UPDATE( bmcbowl ) */ int x,y,z,pixdat; - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); z=0; for (y=0;y<230;y++) diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c index 2a5cf36908a..4ae08cb3a52 100644 --- a/src/mame/drivers/bnstars.c +++ b/src/mame/drivers/bnstars.c @@ -510,7 +510,7 @@ static VIDEO_UPDATE(bnstars) tilemap_draw(bitmap,cliprect,ms32_tx_tilemap[0],0,4); - draw_sprites(machine,bitmap,cliprect, ms32_spram, 0x20000, 0); + draw_sprites(screen->machine,bitmap,cliprect, ms32_spram, 0x20000, 0); } else { @@ -527,7 +527,7 @@ static VIDEO_UPDATE(bnstars) tilemap_set_scrolly(ms32_tx_tilemap[1], 0, ms32_tx1_scroll[0x0c/4] + ms32_tx1_scroll[0x14/4]); tilemap_draw(bitmap,cliprect,ms32_tx_tilemap[1],0,4); - draw_sprites(machine,bitmap,cliprect, ms32_spram+(0x20000/4), 0x20000, 4); + draw_sprites(screen->machine,bitmap,cliprect, ms32_spram+(0x20000/4), 0x20000, 4); } return 0; diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c index 0853f71b437..7a10cf3102f 100644 --- a/src/mame/drivers/calorie.c +++ b/src/mame/drivers/calorie.c @@ -156,12 +156,12 @@ static VIDEO_UPDATE( calorie ) if( calorie_sprites[x+1] & 0x10 ) { /* 32x32 sprites */ - drawgfx(bitmap,machine->gfx[3],tileno | 0x40,color,flipx,flipy,xpos,ypos - 31,cliprect,TRANSPARENCY_PEN,0); + drawgfx(bitmap,screen->machine->gfx[3],tileno | 0x40,color,flipx,flipy,xpos,ypos - 31,cliprect,TRANSPARENCY_PEN,0); } else { /* 16x16 sprites */ - drawgfx(bitmap,machine->gfx[2],tileno,color,flipx,flipy,xpos,ypos - 15,cliprect,TRANSPARENCY_PEN,0); + drawgfx(bitmap,screen->machine->gfx[2],tileno,color,flipx,flipy,xpos,ypos - 15,cliprect,TRANSPARENCY_PEN,0); } } return 0; diff --git a/src/mame/drivers/cardline.c b/src/mame/drivers/cardline.c index 040eb8bfa26..ff9190531c3 100644 --- a/src/mame/drivers/cardline.c +++ b/src/mame/drivers/cardline.c @@ -24,7 +24,7 @@ static int cardline_video; -#define DRAW_TILE(offset, transparency) drawgfx(bitmap, machine->gfx[0],\ +#define DRAW_TILE(offset, transparency) drawgfx(bitmap, screen->machine->gfx[0],\ (videoram[index+offset] | (colorram[index+offset]<<8))&0x3fff,\ (colorram[index+offset]&0x80)>>7,\ 0,0,\ diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c index 6f158b752e0..6be8e518a28 100644 --- a/src/mame/drivers/carrera.c +++ b/src/mame/drivers/carrera.c @@ -257,7 +257,7 @@ static VIDEO_UPDATE(carrera) { int tile = carrera_tileram[count&0x7ff] | carrera_tileram[(count&0x7ff)+0x800]<<8; - drawgfx(bitmap,machine->gfx[0],tile,0,0,0,x*8,y*8,cliprect,TRANSPARENCY_NONE,0); + drawgfx(bitmap,screen->machine->gfx[0],tile,0,0,0,x*8,y*8,cliprect,TRANSPARENCY_NONE,0); count++; } } diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c index d80ed51eb6b..f453d7e254c 100644 --- a/src/mame/drivers/cball.c +++ b/src/mame/drivers/cball.c @@ -40,7 +40,7 @@ static VIDEO_UPDATE( cball ) /* draw sprite */ - drawgfx(bitmap, machine->gfx[1], + drawgfx(bitmap, screen->machine->gfx[1], cball_video_ram[0x399] >> 4, 0, 0, 0, diff --git a/src/mame/drivers/cherrym.c b/src/mame/drivers/cherrym.c index 14bc2c37def..23936112bbf 100644 --- a/src/mame/drivers/cherrym.c +++ b/src/mame/drivers/cherrym.c @@ -104,7 +104,7 @@ static VIDEO_START(cm) static VIDEO_UPDATE(cm) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); -// draw_sprites(machine, bitmap, cliprect); +// draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c index b6f696f768d..46ecf5f6430 100644 --- a/src/mame/drivers/chinsan.c +++ b/src/mame/drivers/chinsan.c @@ -62,7 +62,7 @@ static VIDEO_UPDATE(chinsan) int tileno,colour; tileno = chinsan_video[count] | (chinsan_video[count+0x800]<<8); colour = chinsan_video[count+0x1000]>>3; - drawgfx(bitmap,machine->gfx[0],tileno,colour,0,0,x*8,y*8,cliprect,TRANSPARENCY_NONE,0); + drawgfx(bitmap,screen->machine->gfx[0],tileno,colour,0,0,x*8,y*8,cliprect,TRANSPARENCY_NONE,0); count++; } } diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c index 2ebd8d2c671..86f1e9e90dd 100644 --- a/src/mame/drivers/cliffhgr.c +++ b/src/mame/drivers/cliffhgr.c @@ -133,9 +133,9 @@ static VIDEO_UPDATE( cliff ) render_texture_set_bitmap(overlay_texture, bitmap, &fixedvis, 0, TEXFORMAT_PALETTEA16); /* add both quads to the screen */ - render_container_empty(render_container_get_screen(screen)); - render_screen_add_quad(screen, 0.0f, 0.0f, 1.0f, 1.0f, MAKE_ARGB(0xff,0xff,0xff,0xff), video_texture, PRIMFLAG_BLENDMODE(BLENDMODE_NONE) | PRIMFLAG_SCREENTEX(1)); - render_screen_add_quad(screen, 0.0f, 0.0f, 1.0f, 1.0f, MAKE_ARGB(0xff,0xff,0xff,0xff), overlay_texture, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA) | PRIMFLAG_SCREENTEX(1)); + render_container_empty(render_container_get_screen(scrnum)); + render_screen_add_quad(scrnum, 0.0f, 0.0f, 1.0f, 1.0f, MAKE_ARGB(0xff,0xff,0xff,0xff), video_texture, PRIMFLAG_BLENDMODE(BLENDMODE_NONE) | PRIMFLAG_SCREENTEX(1)); + render_screen_add_quad(scrnum, 0.0f, 0.0f, 1.0f, 1.0f, MAKE_ARGB(0xff,0xff,0xff,0xff), overlay_texture, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA) | PRIMFLAG_SCREENTEX(1)); } /* display disc information */ diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c index 17424f665bb..8106a6248f3 100644 --- a/src/mame/drivers/cntsteer.c +++ b/src/mame/drivers/cntsteer.c @@ -244,8 +244,8 @@ static int scroll=0; tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect,0); - draw_sprites(machine,bitmap,cliprect,1); + draw_sprites(screen->machine,bitmap,cliprect,0); + draw_sprites(screen->machine,bitmap,cliprect,1); #if 0 { diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c index 51918f5e3e1..4e1649fa216 100644 --- a/src/mame/drivers/cps3.c +++ b/src/mame/drivers/cps3.c @@ -1049,7 +1049,7 @@ static VIDEO_UPDATE(cps3) { if (cps3_screenwidth!=496) { - screen_state *state = &machine->screen[0]; + screen_state *state = &screen->machine->screen[0]; rectangle visarea = state->visarea; cps3_screenwidth = 496; visarea.min_x = 0; visarea.max_x = 496-1; @@ -1061,7 +1061,7 @@ static VIDEO_UPDATE(cps3) { if (cps3_screenwidth!=384) { - screen_state *state = &machine->screen[0]; + screen_state *state = &screen->machine->screen[0]; rectangle visarea = state->visarea; cps3_screenwidth = 384; visarea.min_x = 0; visarea.max_x = 384-1; @@ -1256,13 +1256,13 @@ static VIDEO_UPDATE(cps3) /* use the bpp value from the main list or the sublists? */ if (whichbpp) { - if (!global_bpp) machine->gfx[1]->color_granularity=256; - else machine->gfx[1]->color_granularity=64; + if (!global_bpp) screen->machine->gfx[1]->color_granularity=256; + else screen->machine->gfx[1]->color_granularity=64; } else { - if (!bpp) machine->gfx[1]->color_granularity=256; - else machine->gfx[1]->color_granularity=64; + if (!bpp) screen->machine->gfx[1]->color_granularity=256; + else screen->machine->gfx[1]->color_granularity=64; } { @@ -1270,17 +1270,17 @@ static VIDEO_UPDATE(cps3) if (cps3_char_ram_dirty[realtileno]) { - decodechar(machine->gfx[1], realtileno, (UINT8*)cps3_char_ram); + decodechar(screen->machine->gfx[1], realtileno, (UINT8*)cps3_char_ram); cps3_char_ram_dirty[realtileno] = 0; } if (global_alpha || alpha) { - cps3_drawgfxzoom(renderbuffer_bitmap, machine->gfx[1],realtileno,actualpal,0^flipx,0^flipy,current_xpos,current_ypos,&renderbuffer_clip,CPS3_TRANSPARENCY_PEN_INDEX_BLEND,0,xinc,yinc, NULL, 0); + cps3_drawgfxzoom(renderbuffer_bitmap, screen->machine->gfx[1],realtileno,actualpal,0^flipx,0^flipy,current_xpos,current_ypos,&renderbuffer_clip,CPS3_TRANSPARENCY_PEN_INDEX_BLEND,0,xinc,yinc, NULL, 0); } else { - cps3_drawgfxzoom(renderbuffer_bitmap, machine->gfx[1],realtileno,actualpal,0^flipx,0^flipy,current_xpos,current_ypos,&renderbuffer_clip,CPS3_TRANSPARENCY_PEN_INDEX,0,xinc,yinc, NULL, 0); + cps3_drawgfxzoom(renderbuffer_bitmap, screen->machine->gfx[1],realtileno,actualpal,0^flipx,0^flipy,current_xpos,current_ypos,&renderbuffer_clip,CPS3_TRANSPARENCY_PEN_INDEX,0,xinc,yinc, NULL, 0); } count++; } @@ -1349,11 +1349,11 @@ static VIDEO_UPDATE(cps3) if (cps3_ss_ram_dirty[tile]) { - decodechar(machine->gfx[0], tile, (UINT8*)cps3_ss_ram); + decodechar(screen->machine->gfx[0], tile, (UINT8*)cps3_ss_ram); cps3_ss_ram_dirty[tile] = 0; } - cps3_drawgfxzoom(bitmap, machine->gfx[0],tile,pal,flipx,flipy,x*8,y*8,cliprect,CPS3_TRANSPARENCY_PEN,0,0x10000,0x10000,NULL,0); + cps3_drawgfxzoom(bitmap, screen->machine->gfx[0],tile,pal,flipx,flipy,x*8,y*8,cliprect,CPS3_TRANSPARENCY_PEN,0,0x10000,0x10000,NULL,0); count++; } } diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c index 44fdacc15ad..fcc6e36e15a 100644 --- a/src/mame/drivers/cshooter.c +++ b/src/mame/drivers/cshooter.c @@ -145,7 +145,7 @@ static VIDEO_START(cshooter) static VIDEO_UPDATE(cshooter) { - fillbitmap(bitmap, 0/*get_black_pen(machine)*/, &machine->screen[0].visarea); + fillbitmap(bitmap, 0/*get_black_pen(screen->screen->machine)*/, cliprect); tilemap_mark_all_tiles_dirty(cshooter_txtilemap); //sprites @@ -157,28 +157,28 @@ static VIDEO_UPDATE(cshooter) { int tile=0x30+((spriteram[i]>>2)&0x1f); - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], tile, spriteram[i+1], 0, 0, spriteram[i+3],spriteram[i+2], cliprect,TRANSPARENCY_PEN,3); - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], tile, spriteram[i+1], 0, 0, spriteram[i+3]+8,spriteram[i+2], cliprect,TRANSPARENCY_PEN,3); - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], tile, spriteram[i+1], 0, 0, spriteram[i+3]+8,spriteram[i+2]+8, cliprect,TRANSPARENCY_PEN,3); - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], tile, spriteram[i+1], 0, 0, diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c index b16e7aeb13d..e77d69bd688 100644 --- a/src/mame/drivers/cultures.c +++ b/src/mame/drivers/cultures.c @@ -91,7 +91,7 @@ static VIDEO_UPDATE( cultures ) tilemap_draw(bitmap, cliprect, bg1_tilemap, 0, 0); } else - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); return 0; } diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c index bf2763a393c..f716b227f31 100644 --- a/src/mame/drivers/dacholer.c +++ b/src/mame/drivers/dacholer.c @@ -297,7 +297,7 @@ static VIDEO_UPDATE(dacholer) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c index 1d6cd0555a9..55fe2816b53 100644 --- a/src/mame/drivers/darkhors.c +++ b/src/mame/drivers/darkhors.c @@ -165,7 +165,7 @@ static VIDEO_UPDATE( darkhors ) } #endif - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); tilemap_set_scrollx(darkhors_tmap,0, (darkhors_tmapscroll[0] >> 16) - 5); tilemap_set_scrolly(darkhors_tmap,0, (darkhors_tmapscroll[0] & 0xffff) - 0xff ); @@ -175,7 +175,7 @@ static VIDEO_UPDATE( darkhors ) tilemap_set_scrolly(darkhors_tmap2,0, (darkhors_tmapscroll2[0] & 0xffff) - 0xff ); if (layers_ctrl & 2) tilemap_draw(bitmap,cliprect, darkhors_tmap2, 0, 0); - if (layers_ctrl & 4) draw_sprites(machine,bitmap,cliprect); + if (layers_ctrl & 4) draw_sprites(screen->machine,bitmap,cliprect); #if DARKHORS_DEBUG #if 0 diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c index 439bf233150..c184dea6d64 100644 --- a/src/mame/drivers/dblewing.c +++ b/src/mame/drivers/dblewing.c @@ -157,7 +157,7 @@ static VIDEO_UPDATE(dblewing) deco16_tilemap_2_draw(bitmap,cliprect,0,2); deco16_tilemap_1_draw(bitmap,cliprect,0,4); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c index 3484b6646cb..131498b0d77 100644 --- a/src/mame/drivers/ddayjlc.c +++ b/src/mame/drivers/ddayjlc.c @@ -361,7 +361,7 @@ static VIDEO_UPDATE( ddayjlc ) code=(code&0x7f)|((flags&0x30)<<3); - drawgfx(bitmap, machine->gfx[0], code, 1, xflip, yflip, x, y, cliprect, TRANSPARENCY_PEN, 0); + drawgfx(bitmap, screen->machine->gfx[0], code, 1, xflip, yflip, x, y, cliprect, TRANSPARENCY_PEN, 0); } { @@ -371,9 +371,9 @@ static VIDEO_UPDATE( ddayjlc ) { c=videoram[y*32+x]; if(x>1&&x<30) - drawgfx(bitmap, machine->gfx[1], c+char_bank*0x100, 1, 0, 0, x*8, y*8, cliprect, TRANSPARENCY_PEN, 0); + drawgfx(bitmap, screen->machine->gfx[1], c+char_bank*0x100, 1, 0, 0, x*8, y*8, cliprect, TRANSPARENCY_PEN, 0); else - drawgfx(bitmap, machine->gfx[1], c+char_bank*0x100, 1, 0, 0, x*8, y*8, cliprect, TRANSPARENCY_NONE, 0); + drawgfx(bitmap, screen->machine->gfx[1], c+char_bank*0x100, 1, 0, 0, x*8, y*8, cliprect, TRANSPARENCY_NONE, 0); } } return 0; diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c index 724ed8b0948..595531a7ff5 100644 --- a/src/mame/drivers/ddealer.c +++ b/src/mame/drivers/ddealer.c @@ -139,7 +139,7 @@ static void ddealer_protection(running_machine *machine) static VIDEO_UPDATE( ddealer ) { - ddealer_protection(machine); + ddealer_protection(screen->machine); return 0; } diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c index bd9398a95d3..358735cacf7 100644 --- a/src/mame/drivers/deco156.c +++ b/src/mame/drivers/deco156.c @@ -144,7 +144,7 @@ static VIDEO_UPDATE( wcvol95 ) deco16_pf12_update(deco16_pf1_rowscroll,deco16_pf2_rowscroll); deco16_tilemap_2_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); deco16_tilemap_1_draw(bitmap,cliprect,0,0); return 0; } diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c index da24d5e45c5..3fc7fff9c2b 100644 --- a/src/mame/drivers/discoboy.c +++ b/src/mame/drivers/discoboy.c @@ -120,7 +120,7 @@ static VIDEO_UPDATE( discoboy ) g = ((pal >> 4) & 0xf) << 4; r = ((pal >> 8) & 0xf) << 4; - palette_set_color(machine, i/2, MAKE_RGB(r, g, b)); + palette_set_color(screen->machine, i/2, MAKE_RGB(r, g, b)); } for (i=0;i<0x800;i+=2) @@ -133,7 +133,7 @@ static VIDEO_UPDATE( discoboy ) g = ((pal >> 4) & 0xf) << 4; r = ((pal >> 8) & 0xf) << 4; - palette_set_color(machine, (i/2)+0x400, MAKE_RGB(r, g, b)); + palette_set_color(screen->machine, (i/2)+0x400, MAKE_RGB(r, g, b)); } fillbitmap(bitmap, 0x3ff, cliprect); @@ -154,12 +154,12 @@ static VIDEO_UPDATE( discoboy ) } - drawgfx(bitmap,machine->gfx[1], tileno ,discoboy_ram_att[count/2],0,0,x*8,y*8,cliprect,TRANSPARENCY_NONE,0); + drawgfx(bitmap,screen->machine->gfx[1], tileno ,discoboy_ram_att[count/2],0,0,x*8,y*8,cliprect,TRANSPARENCY_NONE,0); count+=2; } } - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c index 6b36807640a..ca44a86fc38 100644 --- a/src/mame/drivers/dlair.c +++ b/src/mame/drivers/dlair.c @@ -217,8 +217,8 @@ static VIDEO_UPDATE( dlair ) last_seqid = seqid; /* cover the whole screen with a quad */ - render_container_empty(render_container_get_screen(screen)); - render_screen_add_quad(screen, 0.0f, 0.0f, 1.0f, 1.0f, MAKE_ARGB(0xff,0xff,0xff,0xff), video_texture, PRIMFLAG_BLENDMODE(BLENDMODE_NONE) | PRIMFLAG_SCREENTEX(1)); + render_container_empty(render_container_get_screen(scrnum)); + render_screen_add_quad(scrnum, 0.0f, 0.0f, 1.0f, 1.0f, MAKE_ARGB(0xff,0xff,0xff,0xff), video_texture, PRIMFLAG_BLENDMODE(BLENDMODE_NONE) | PRIMFLAG_SCREENTEX(1)); if (discinfo != NULL) popmessage("%s", laserdisc_describe_state(discinfo)); @@ -238,11 +238,11 @@ static VIDEO_UPDATE( dleuro ) for (x = 0; x < 32; x++) { UINT8 *base = &videoram[y * 64 + x * 2 + 1]; - drawgfx(overlay_bitmap, machine->gfx[0], base[0], base[1], 0, 0, 10 * x, 16 * y, cliprect, TRANSPARENCY_NONE, 0); + drawgfx(overlay_bitmap, screen->machine->gfx[0], base[0], base[1], 0, 0, 10 * x, 16 * y, cliprect, TRANSPARENCY_NONE, 0); } /* update the overlay */ - render_texture_set_bitmap(overlay_texture, overlay_bitmap, &machine->screen[0].visarea, 0, TEXFORMAT_PALETTE16); + render_texture_set_bitmap(overlay_texture, overlay_bitmap, &screen->machine->screen[0].visarea, 0, TEXFORMAT_PALETTE16); /* get the current video and update the bitmap if different */ seqid = laserdisc_get_video(discinfo, &vidbitmap); @@ -251,11 +251,11 @@ static VIDEO_UPDATE( dleuro ) last_seqid = seqid; /* cover the whole screen with a quad */ - render_container_empty(render_container_get_screen(screen)); + render_container_empty(render_container_get_screen(scrnum)); if (last_misc & 0x02) - render_screen_add_quad(screen, 0.0f, 0.0f, 1.0f, 1.0f, MAKE_ARGB(0xff,0xff,0xff,0xff), video_texture, PRIMFLAG_BLENDMODE(BLENDMODE_NONE) | PRIMFLAG_SCREENTEX(1)); + render_screen_add_quad(scrnum, 0.0f, 0.0f, 1.0f, 1.0f, MAKE_ARGB(0xff,0xff,0xff,0xff), video_texture, PRIMFLAG_BLENDMODE(BLENDMODE_NONE) | PRIMFLAG_SCREENTEX(1)); else - render_screen_add_quad(screen, 0.0f, 0.0f, 1.0f, 1.0f, MAKE_ARGB(0xff,0xff,0xff,0xff), overlay_texture, PRIMFLAG_BLENDMODE(BLENDMODE_NONE) | PRIMFLAG_SCREENTEX(1)); + render_screen_add_quad(scrnum, 0.0f, 0.0f, 1.0f, 1.0f, MAKE_ARGB(0xff,0xff,0xff,0xff), overlay_texture, PRIMFLAG_BLENDMODE(BLENDMODE_NONE) | PRIMFLAG_SCREENTEX(1)); if (discinfo != NULL) popmessage("%s", laserdisc_describe_state(discinfo)); diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c index 7b8f390ab2d..50a5b9cfc4e 100644 --- a/src/mame/drivers/dmndrby.c +++ b/src/mame/drivers/dmndrby.c @@ -140,9 +140,9 @@ static VIDEO_START(dderby) static VIDEO_UPDATE(dderby) { int x,y,count; - const gfx_element *gfx = machine->gfx[0]; + const gfx_element *gfx = screen->machine->gfx[0]; - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); count=0; for (y=0;y<32;y++) diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c index 46c27a3842b..3584ff18c5e 100644 --- a/src/mame/drivers/dominob.c +++ b/src/mame/drivers/dominob.c @@ -81,7 +81,7 @@ static VIDEO_UPDATE( dominob ) for(x=0;x<256/32;x++) { drawgfx( bitmap, - machine->gfx[1], + screen->machine->gfx[1], bgram[index]+256*(bgram[index+1]&0xf), bgram[index+1]>>4, 0, 0, @@ -98,7 +98,7 @@ static VIDEO_UPDATE( dominob ) for(x=0;x<32;x++) { drawgfx( bitmap, - machine->gfx[0], + screen->machine->gfx[0], videoram[(y*32+x)*2+1]+(videoram[(y*32+x)*2]&7)*256, (videoram[(y*32+x)*2]>>3), 0, 0, @@ -108,7 +108,7 @@ static VIDEO_UPDATE( dominob ) } } - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c index 85908b63363..53af2704e95 100644 --- a/src/mame/drivers/dreamwld.c +++ b/src/mame/drivers/dreamwld.c @@ -175,7 +175,7 @@ static VIDEO_UPDATE(dreamwld) tilemap_draw(bitmap,cliprect,dreamwld_bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,dreamwld_bg2_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c index 433294fec73..a8a8fe7f358 100644 --- a/src/mame/drivers/drtomy.c +++ b/src/mame/drivers/drtomy.c @@ -101,7 +101,7 @@ static VIDEO_UPDATE( drtomy ) { tilemap_draw(bitmap,cliprect,tilemap_bg,0,0); tilemap_draw(bitmap,cliprect,tilemap_fg,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c index b198cc98fa0..9afbf74bd5c 100644 --- a/src/mame/drivers/dunhuang.c +++ b/src/mame/drivers/dunhuang.c @@ -126,7 +126,7 @@ if (input_code_pressed(KEYCODE_Z)) } #endif - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); switch (dunhuang_layers) { diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c index 98cd85e4054..355038774b9 100644 --- a/src/mame/drivers/dwarfd.c +++ b/src/mame/drivers/dwarfd.c @@ -530,8 +530,8 @@ static void drawCrt(running_machine *machine, bitmap_t *bitmap,const rectangle * static VIDEO_UPDATE( dwarfd ) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); - drawCrt(machine,bitmap,cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); + drawCrt(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c index f9ce10e43cc..db2aa6b7af6 100644 --- a/src/mame/drivers/egghunt.c +++ b/src/mame/drivers/egghunt.c @@ -153,7 +153,7 @@ static VIDEO_START(egghunt) static VIDEO_UPDATE(egghunt) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c index b1a4efacd56..30c7a61bb41 100644 --- a/src/mame/drivers/enigma2.c +++ b/src/mame/drivers/enigma2.c @@ -173,7 +173,7 @@ static VIDEO_UPDATE( enigma2 ) UINT8 *star_map_base = (blink_count & 0x08) ? &memory_region(REGION_PROMS)[0x0c00] : &memory_region(REGION_PROMS)[0x0800]; UINT8 x = 0; - UINT16 bitmap_y = machine->screen[screen].visarea.min_y; + UINT16 bitmap_y = screen->machine->screen[scrnum].visarea.min_y; UINT8 y = (UINT8)vpos_to_vysnc_chain_counter(bitmap_y); UINT8 video_data = 0; UINT8 fore_color = 0; @@ -235,7 +235,7 @@ static VIDEO_UPDATE( enigma2 ) if (x == 0) { /* end of screen? */ - if (bitmap_y == machine->screen[screen].visarea.max_y) + if (bitmap_y == screen->machine->screen[scrnum].visarea.max_y) { break; } @@ -255,7 +255,7 @@ static VIDEO_UPDATE( enigma2 ) static VIDEO_UPDATE( enigma2a ) { UINT8 x = 0; - UINT16 bitmap_y = machine->screen[screen].visarea.min_y; + UINT16 bitmap_y = screen->machine->screen[scrnum].visarea.min_y; UINT8 y = (UINT8)vpos_to_vysnc_chain_counter(bitmap_y); UINT8 video_data = 0; @@ -298,7 +298,7 @@ static VIDEO_UPDATE( enigma2a ) if (x == 0) { /* end of screen? */ - if (bitmap_y == machine->screen[screen].visarea.max_y) + if (bitmap_y == screen->machine->screen[scrnum].visarea.max_y) { break; } diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c index 560fef091c1..50ad356d383 100644 --- a/src/mame/drivers/esh.c +++ b/src/mame/drivers/esh.c @@ -62,7 +62,7 @@ static VIDEO_UPDATE( esh ) //int blinkLine = (tile_control_ram[current_screen_character] & 0x40) >> 6; //int blinkChar = (tile_control_ram[current_screen_character] & 0x80) >> 7; - drawgfx(bitmap, machine->gfx[0], + drawgfx(bitmap, screen->machine->gfx[0], tile_ram[current_screen_character] + (0x100 * tileOffs), palIndex, 0, 0, charx*8, chary*8, cliprect, TRANSPARENCY_PEN, 0); diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c index d3c5e9717d3..532d4c083f1 100644 --- a/src/mame/drivers/fcrash.c +++ b/src/mame/drivers/fcrash.c @@ -136,7 +136,7 @@ static VIDEO_UPDATE( fcrash ) cps1_get_video_base(); /* Build palette */ - cps1_build_palette(machine); + cps1_build_palette(screen->machine); fcrash_update_transmasks(); @@ -180,13 +180,13 @@ static VIDEO_UPDATE( fcrash ) l2 = (layercontrol >> 0x0a) & 03; l3 = (layercontrol >> 0x0c) & 03; - fcrash_render_layer(machine,bitmap,cliprect,l0,0); + fcrash_render_layer(screen->machine,bitmap,cliprect,l0,0); if (l1 == 0) fcrash_render_high_layer(bitmap,cliprect,l0); - fcrash_render_layer(machine,bitmap,cliprect,l1,0); + fcrash_render_layer(screen->machine,bitmap,cliprect,l1,0); if (l2 == 0) fcrash_render_high_layer(bitmap,cliprect,l1); - fcrash_render_layer(machine,bitmap,cliprect,l2,0); + fcrash_render_layer(screen->machine,bitmap,cliprect,l2,0); if (l3 == 0) fcrash_render_high_layer(bitmap,cliprect,l2); - fcrash_render_layer(machine,bitmap,cliprect,l3,0); + fcrash_render_layer(screen->machine,bitmap,cliprect,l3,0); return 0; diff --git a/src/mame/drivers/filetto.c b/src/mame/drivers/filetto.c index ab43b68b7d8..2198810995e 100644 --- a/src/mame/drivers/filetto.c +++ b/src/mame/drivers/filetto.c @@ -250,16 +250,16 @@ static VIDEO_UPDATE( filetto ) if(vga_mode[0] & 8) { if(vga_mode[0] & 2) - cga_graphic_bitmap(machine,bitmap,cliprect,0,0x18000); + cga_graphic_bitmap(screen->machine,bitmap,cliprect,0,0x18000); else { switch(vga_mode[0] & 1) { case 0x00: - cga_alphanumeric_tilemap(machine,bitmap,cliprect,RES_320x200,0x18000); + cga_alphanumeric_tilemap(screen->machine,bitmap,cliprect,RES_320x200,0x18000); break; case 0x01: - cga_alphanumeric_tilemap(machine,bitmap,cliprect,RES_640x200,0x18000); + cga_alphanumeric_tilemap(screen->machine,bitmap,cliprect,RES_640x200,0x18000); break; } } diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c index 1e77edadf4c..fe910721e42 100644 --- a/src/mame/drivers/firebeat.c +++ b/src/mame/drivers/firebeat.c @@ -469,12 +469,12 @@ static int tick = 0; static int layer = 0; static VIDEO_UPDATE(firebeat) { - int chip = screen; + int chip = scrnum; //int i; fillbitmap(bitmap, 0, cliprect); - if (mame_stricmp(machine->gamedrv->name, "popn7") == 0) + if (mame_stricmp(screen->machine->gamedrv->name, "popn7") == 0) { gcu_exec_display_list(chip, bitmap, cliprect, 0x1f80000); } diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c index d2389728eaa..cf82fda22bf 100644 --- a/src/mame/drivers/fortecar.c +++ b/src/mame/drivers/fortecar.c @@ -132,7 +132,7 @@ static VIDEO_UPDATE(fortecar) tile = fortecar_ram[0x800+(count*4)+1]; - drawgfx(bitmap,machine->gfx[0],tile,0,0,0,x*8,y*8,cliprect,TRANSPARENCY_PEN,0); + drawgfx(bitmap,screen->machine->gfx[0],tile,0,0,0,x*8,y*8,cliprect,TRANSPARENCY_PEN,0); count++; } diff --git a/src/mame/drivers/galaxia.c b/src/mame/drivers/galaxia.c index 6bd7bfd0464..44c0c084db5 100644 --- a/src/mame/drivers/galaxia.c +++ b/src/mame/drivers/galaxia.c @@ -43,7 +43,7 @@ static VIDEO_UPDATE( galaxia ) for (x=0;x<256/8;x++) { int tile = galaxia_video[count]; - drawgfx(bitmap,machine->gfx[0],tile,0,0,0,x*8,y*8,cliprect,TRANSPARENCY_NONE,0); + drawgfx(bitmap,screen->machine->gfx[0],tile,0,0,0,x*8,y*8,cliprect,TRANSPARENCY_NONE,0); count++; } diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c index 10f259b3c22..9d0d7ec0a3f 100644 --- a/src/mame/drivers/galpani3.c +++ b/src/mame/drivers/galpani3.c @@ -102,9 +102,8 @@ extern void skns_draw_sprites(running_machine *machine, bitmap_t *bitmap, const static VIDEO_UPDATE(galpani3) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); - - skns_draw_sprites(machine,bitmap,cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); + skns_draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c index ad15be6e881..84d9f4c1b10 100644 --- a/src/mame/drivers/gamecstl.c +++ b/src/mame/drivers/gamecstl.c @@ -95,7 +95,7 @@ static void draw_char(running_machine *machine, bitmap_t *bitmap, const rectangl static VIDEO_UPDATE(gamecstl) { int i, j; - const gfx_element *gfx = machine->gfx[0]; + const gfx_element *gfx = screen->machine->gfx[0]; UINT32 *cga = cga_ram; int index = 0; @@ -110,8 +110,8 @@ static VIDEO_UPDATE(gamecstl) int att1 = (cga[index] >> 24) & 0xff; int ch1 = (cga[index] >> 16) & 0xff; - draw_char(machine, bitmap, cliprect, gfx, ch0, att0, i*8, j*8); - draw_char(machine, bitmap, cliprect, gfx, ch1, att1, (i*8)+8, j*8); + draw_char(screen->machine, bitmap, cliprect, gfx, ch0, att0, i*8, j*8); + draw_char(screen->machine, bitmap, cliprect, gfx, ch1, att1, (i*8)+8, j*8); index++; } } diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c index 7d7e4fe4a0d..33563115916 100644 --- a/src/mame/drivers/go2000.c +++ b/src/mame/drivers/go2000.c @@ -143,7 +143,7 @@ static VIDEO_UPDATE(go2000) { int tile = go2000_video[count]; int attr = go2000_video2[count]; - drawgfx(bitmap,machine->gfx[0],tile,attr,0,0,x*8,y*8,cliprect,TRANSPARENCY_NONE,0); + drawgfx(bitmap,screen->machine->gfx[0],tile,attr,0,0,x*8,y*8,cliprect,TRANSPARENCY_NONE,0); count++; } } @@ -155,7 +155,7 @@ static VIDEO_UPDATE(go2000) { int tile = go2000_video[count]; int attr = go2000_video2[count]; - drawgfx(bitmap,machine->gfx[0],tile,attr,0,0,x*8,y*8,cliprect,TRANSPARENCY_PEN,0); + drawgfx(bitmap,screen->machine->gfx[0],tile,attr,0,0,x*8,y*8,cliprect,TRANSPARENCY_PEN,0); count++; } } diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c index 4636e291fda..293eec7ebcf 100644 --- a/src/mame/drivers/gpworld.c +++ b/src/mame/drivers/gpworld.c @@ -206,7 +206,7 @@ static VIDEO_UPDATE( gpworld ) { fillbitmap(bitmap, 0, cliprect); - gpworld_draw_tiles(machine, bitmap, cliprect); + gpworld_draw_tiles(screen->machine, bitmap, cliprect); gpworld_draw_sprites(bitmap, cliprect); /* display disc information */ diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c index 13f7fc88914..ea5c9f7b6f6 100644 --- a/src/mame/drivers/gstream.c +++ b/src/mame/drivers/gstream.c @@ -379,7 +379,7 @@ static VIDEO_UPDATE(gstream) if (x & 0x8000) x-=0x10000; if (y & 0x8000) y-=0x10000; - drawgfx(bitmap,machine->gfx[1],code,col,0,0,x-2,y,cliprect,TRANSPARENCY_PEN,0); + drawgfx(bitmap,screen->machine->gfx[1],code,col,0,0,x-2,y,cliprect,TRANSPARENCY_PEN,0); } return 0; diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c index 3800739b96b..c529bbf2c50 100644 --- a/src/mame/drivers/gticlub.c +++ b/src/mame/drivers/gticlub.c @@ -102,14 +102,14 @@ static VIDEO_START( hangplt ) static VIDEO_UPDATE( hangplt ) { - fillbitmap(bitmap, machine->pens[0], cliprect); + fillbitmap(bitmap, screen->machine->pens[0], cliprect); - K001604_tile_update(screen); + K001604_tile_update(scrnum); // K001604_draw_back_layer(bitmap, cliprect); - voodoo_update(screen, bitmap, cliprect); + voodoo_update(scrnum, bitmap, cliprect); - K001604_draw_front_layer(screen, bitmap, cliprect); + K001604_draw_front_layer(scrnum, bitmap, cliprect); draw_7segment_led(bitmap, 3, 3, gticlub_led_reg0); draw_7segment_led(bitmap, 9, 3, gticlub_led_reg1); diff --git a/src/mame/drivers/hal21.c b/src/mame/drivers/hal21.c index 1c813522f1b..f9642529382 100644 --- a/src/mame/drivers/hal21.c +++ b/src/mame/drivers/hal21.c @@ -320,23 +320,23 @@ static VIDEO_UPDATE( aso ) if (snk_gamegroup) { - hal21_draw_background(machine, bitmap, cliprect, bgsx+(msbs<<7 & 0x100), bgsy, attr, machine->gfx[1]); + hal21_draw_background(screen->machine, bitmap, cliprect, bgsx+(msbs<<7 & 0x100), bgsy, attr, screen->machine->gfx[1]); attr = snk_blink_parity; snk_blink_parity ^= 0xdf; - for (i=6; i<0x80; i+=8) { palette_set_color(machine, i, MAKE_RGB(attr, attr, attr)); } + for (i=6; i<0x80; i+=8) { palette_set_color(screen->machine, i, MAKE_RGB(attr, attr, attr)); } - hal21_draw_sprites(bitmap, cliprect, spsx, spsy, machine->gfx[2]); + hal21_draw_sprites(bitmap, cliprect, spsx, spsy, screen->machine->gfx[2]); } else { - aso_draw_background(bitmap, cliprect, bgsx+(~msbs<<7 & 0x100), bgsy, attr, machine->gfx[1]); - aso_draw_sprites(bitmap, cliprect, spsx, spsy, machine->gfx[2]); + aso_draw_background(bitmap, cliprect, bgsx+(~msbs<<7 & 0x100), bgsy, attr, screen->machine->gfx[1]); + aso_draw_sprites(bitmap, cliprect, spsx, spsy, screen->machine->gfx[2]); } bank = msbs>>6 & 1; - tnk3_draw_text(machine, bitmap, cliprect, bank, &textram[0]); - tnk3_draw_status(machine, bitmap, cliprect, bank, &textram[0x400]); + tnk3_draw_text(screen->machine, bitmap, cliprect, bank, &textram[0]); + tnk3_draw_status(screen->machine, bitmap, cliprect, bank, &textram[0x400]); return 0; } diff --git a/src/mame/drivers/hanaroku.c b/src/mame/drivers/hanaroku.c index f6ec2543432..079e5bd909d 100644 --- a/src/mame/drivers/hanaroku.c +++ b/src/mame/drivers/hanaroku.c @@ -68,7 +68,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta static VIDEO_UPDATE(hanaroku) { fillbitmap(bitmap, 0x1f0, cliprect); // ??? - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c index fe64d3651ef..62e492b70b7 100644 --- a/src/mame/drivers/hornet.c +++ b/src/mame/drivers/hornet.c @@ -546,7 +546,7 @@ static VIDEO_UPDATE( hornet ) { voodoo_update(0, bitmap, cliprect); - K037122_tile_update(machine, 0); + K037122_tile_update(screen->machine, 0); K037122_tile_draw(0, bitmap, cliprect); draw_7segment_led(bitmap, 3, 3, led_reg0); @@ -556,11 +556,11 @@ static VIDEO_UPDATE( hornet ) static VIDEO_UPDATE( hornet_2board ) { - voodoo_update(screen, bitmap, cliprect); + voodoo_update(scrnum, bitmap, cliprect); /* TODO: tilemaps per screen */ - K037122_tile_update(machine, screen); - K037122_tile_draw(screen, bitmap, cliprect); + K037122_tile_update(screen->machine, scrnum); + K037122_tile_draw(scrnum, bitmap, cliprect); draw_7segment_led(bitmap, 3, 3, led_reg0); draw_7segment_led(bitmap, 9, 3, led_reg1); diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c index 3c03099ecd6..58276318007 100644 --- a/src/mame/drivers/hotblock.c +++ b/src/mame/drivers/hotblock.c @@ -126,12 +126,12 @@ static VIDEO_UPDATE(hotblock) int i; static int xxx=320,yyy=204; - fillbitmap(bitmap, get_black_pen(machine), 0); + fillbitmap(bitmap, get_black_pen(screen->machine), 0); for (i=0;i<256;i++) { int dat=(hotblock_pal[i*2+1]<<8)|hotblock_pal[i*2]; - palette_set_color_rgb(machine,i,pal5bit(dat>>0),pal5bit(dat>>5),pal5bit(dat>>10)); + palette_set_color_rgb(screen->machine,i,pal5bit(dat>>0),pal5bit(dat>>5),pal5bit(dat>>10)); } count=0; diff --git a/src/mame/drivers/igs_blit.c b/src/mame/drivers/igs_blit.c index 78a114fc527..9f81cba8bb4 100644 --- a/src/mame/drivers/igs_blit.c +++ b/src/mame/drivers/igs_blit.c @@ -135,7 +135,7 @@ static VIDEO_UPDATE(igs) #ifdef MAME_DEBUG if ((layer_enable != -1) && (pri_addr == 0xff)) - *BITMAP_ADDR16(bitmap, y, x) = get_black_pen(machine); + *BITMAP_ADDR16(bitmap, y, x) = get_black_pen(screen->machine); else #endif *BITMAP_ADDR16(bitmap, y, x) = layer[l][scr_addr] | (l << 8); diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c index 04423222fab..4d632408c8c 100644 --- a/src/mame/drivers/igs_m027.c +++ b/src/mame/drivers/igs_m027.c @@ -143,7 +143,7 @@ static VIDEO_START(igs_majhong) static VIDEO_UPDATE(igs_majhong) { //?????????? - fillbitmap(bitmap,get_black_pen(machine),&machine->screen[0].visarea); + fillbitmap(bitmap,get_black_pen(screen->machine),&screen->machine->screen[0].visarea); //?????? tilemap_draw(bitmap,cliprect,igs_bg_tilemap,0,0); diff --git a/src/mame/drivers/intrscti.c b/src/mame/drivers/intrscti.c index 468d5aa03f9..decdf996a59 100644 --- a/src/mame/drivers/intrscti.c +++ b/src/mame/drivers/intrscti.c @@ -69,7 +69,7 @@ static VIDEO_UPDATE(intrscti) int y,x; int count; - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); count = 0; for (y=0;y<64;y++) @@ -78,7 +78,7 @@ static VIDEO_UPDATE(intrscti) { int dat; dat = intrscti_ram[count]; - drawgfx(bitmap,machine->gfx[0],dat/*+0x100*/,0,0,0,x*8,y*8,cliprect,TRANSPARENCY_PEN,0); + drawgfx(bitmap,screen->machine->gfx[0],dat/*+0x100*/,0,0,0,x*8,y*8,cliprect,TRANSPARENCY_PEN,0); count++; } } diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c index 293c6af8a23..dff67bf1fd9 100644 --- a/src/mame/drivers/istellar.c +++ b/src/mame/drivers/istellar.c @@ -70,7 +70,7 @@ static VIDEO_UPDATE( istellar ) { int current_screen_character = (chary*32) + charx; - drawgfx(bitmap, machine->gfx[0], + drawgfx(bitmap, screen->machine->gfx[0], tile_ram[current_screen_character], (tile_control_ram[current_screen_character] & 0x0f), 0, 0, charx*8, chary*8, cliprect, TRANSPARENCY_PEN, 0); diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c index a4ddceba7f5..eb1cfe11a0c 100644 --- a/src/mame/drivers/jalmah.c +++ b/src/mame/drivers/jalmah.c @@ -348,11 +348,11 @@ static VIDEO_UPDATE( jalmah ) #define SUCHIPI_MCU (0x23) */ case MJZOOMIN_MCU: - case DAIREIKA_MCU: daireika_mcu_run(machine); break; - case URASHIMA_MCU: urashima_mcu_run(machine); break; + case DAIREIKA_MCU: daireika_mcu_run(screen->machine); break; + case URASHIMA_MCU: urashima_mcu_run(screen->machine); break; case KAKUMEI_MCU: case KAKUMEI2_MCU: - case SUCHIPI_MCU: second_mcu_run(machine); break; + case SUCHIPI_MCU: second_mcu_run(screen->machine); break; } tilemap_set_scrollx( sc0_tilemap, 0, jm_scrollram[0] + ((jm_vregs[0] & 3) ? ((jm_scrollram[4] & 0x200) * 4) : 0)); tilemap_set_scrollx( sc1_tilemap, 0, jm_scrollram[1] + ((jm_vregs[1] & 3) ? ((jm_scrollram[5] & 0x200) * 4) : 0)); diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c index 6dedfa335a7..8c70623d52a 100644 --- a/src/mame/drivers/jchan.c +++ b/src/mame/drivers/jchan.c @@ -422,9 +422,8 @@ extern void skns_draw_sprites(running_machine *machine, bitmap_t *bitmap, const static VIDEO_UPDATE(jchan) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); - - skns_draw_sprites(machine,bitmap,cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); + skns_draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c index b169c96fd0a..13acaa1fada 100644 --- a/src/mame/drivers/jollyjgr.c +++ b/src/mame/drivers/jollyjgr.c @@ -352,7 +352,7 @@ static VIDEO_UPDATE( jollyjgr ) if (offs < 3*4) sy++; - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], code,color, flipx,flipy, sx,sy, diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c index a67e1e67613..8309974c285 100644 --- a/src/mame/drivers/laserbat.c +++ b/src/mame/drivers/laserbat.c @@ -550,7 +550,7 @@ static VIDEO_UPDATE( laserbat ) } if(sprite_info.enable) - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], sprite_info.code, sprite_info.color, 0,0, diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c index bc0b138d5a9..8f3fc03e9ce 100644 --- a/src/mame/drivers/lastfght.c +++ b/src/mame/drivers/lastfght.c @@ -104,7 +104,7 @@ static VIDEO_UPDATE( lastfght ) count = base; - fillbitmap( bitmap, get_black_pen(machine), cliprect ); + fillbitmap( bitmap, get_black_pen(screen->machine), cliprect ); for ( y = 0 ; y < 256; y++ ) { for ( x = 0; x < 512; x++ ) diff --git a/src/mame/drivers/lgp.c b/src/mame/drivers/lgp.c index 9cd8fe44373..bab5160451f 100644 --- a/src/mame/drivers/lgp.c +++ b/src/mame/drivers/lgp.c @@ -99,7 +99,7 @@ static VIDEO_UPDATE( lgp ) /* Somewhere there's a flag that offsets the tilemap by 0x100*x */ /* Palette is likely set somewhere as well (tile_control_ram?) */ - drawgfx(bitmap, machine->gfx[0], + drawgfx(bitmap, screen->machine->gfx[0], tile_ram[current_screen_character], 0, 0, 0, charx*8, chary*8, cliprect, TRANSPARENCY_PEN, 0); diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c index 73cbcbfe424..99eb7fe4b11 100644 --- a/src/mame/drivers/limenko.c +++ b/src/mame/drivers/limenko.c @@ -304,7 +304,7 @@ static VIDEO_UPDATE( limenko ) tilemap_draw(bitmap,cliprect,fg_tilemap,0,1); if(limenko_videoreg[0] & 8) - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/drivers/littlerb.c b/src/mame/drivers/littlerb.c index a632afd0b0e..30726f90008 100644 --- a/src/mame/drivers/littlerb.c +++ b/src/mame/drivers/littlerb.c @@ -339,7 +339,7 @@ static VIDEO_UPDATE(littlerb) int x,y,offs, code; int xsize,ysize; UINT16* spriteregion = &littlerb_region4[0x400]; - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); /* the spriteram format is something like this .. */ for (offs=0x26/2;offs<0xc00;offs+=6) // start at 00x26? diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c index 7abadf2dba0..5b5bfea8171 100644 --- a/src/mame/drivers/looping.c +++ b/src/mame/drivers/looping.c @@ -274,10 +274,10 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta static VIDEO_UPDATE( looping ) { - looping_state *state = machine->driver_data; + looping_state *state = screen->machine->driver_data; tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c index 3f244e001bb..f1325217850 100644 --- a/src/mame/drivers/marinedt.c +++ b/src/mame/drivers/marinedt.c @@ -483,7 +483,7 @@ static VIDEO_UPDATE( marinedt ) tilemap_draw(tile, cliprect, tx_tilemap, 0, 0); fillbitmap(obj1, 0, NULL); - drawgfx(obj1, machine->gfx[1], + drawgfx(obj1, screen->machine->gfx[1], OBJ_CODE(marinedt_obj1_a), OBJ_COLOR(marinedt_obj1_a), OBJ_FLIPX(marinedt_obj1_a), OBJ_FLIPY(marinedt_obj1_a), @@ -491,7 +491,7 @@ static VIDEO_UPDATE( marinedt ) NULL, TRANSPARENCY_PEN, 0); fillbitmap(obj2, 0, NULL); - drawgfx(obj2, machine->gfx[2], + drawgfx(obj2, screen->machine->gfx[2], OBJ_CODE(marinedt_obj2_a), OBJ_COLOR(marinedt_obj2_a), OBJ_FLIPX(marinedt_obj2_a), OBJ_FLIPY(marinedt_obj2_a), diff --git a/src/mame/drivers/mastboy.c b/src/mame/drivers/mastboy.c index 26159f883e1..596dd5024dc 100644 --- a/src/mame/drivers/mastboy.c +++ b/src/mame/drivers/mastboy.c @@ -471,7 +471,7 @@ static VIDEO_UPDATE(mastboy) { int coldat = mastboy_colram[i+1] | (mastboy_colram[i+0]<<8); - palette_set_color_rgb(machine,i/2,pal4bit(coldat>>8),pal4bit(coldat>>12),pal4bit(coldat>>4)); + palette_set_color_rgb(screen->machine,i/2,pal4bit(coldat>>8),pal4bit(coldat>>12),pal4bit(coldat>>4)); } for (y=0;y<32;y++) @@ -485,12 +485,12 @@ static VIDEO_UPDATE(mastboy) if (tileno&0x800) { - gfx = machine->gfx[1]; + gfx = screen->machine->gfx[1]; tileno &=0x7ff; } else { - gfx = machine->gfx[0]; + gfx = screen->machine->gfx[0]; } diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c index db990d9c58e..49b104d33dc 100644 --- a/src/mame/drivers/mediagx.c +++ b/src/mame/drivers/mediagx.c @@ -311,11 +311,11 @@ static VIDEO_UPDATE(mediagx) { fillbitmap(bitmap, 0, cliprect); - draw_framebuffer(machine, bitmap, cliprect); + draw_framebuffer(screen->machine, bitmap, cliprect); if (disp_ctrl_reg[DC_OUTPUT_CFG] & 0x1) // don't show MDA text screen on 16-bit mode. this is basically a hack { - draw_cga(machine, bitmap, cliprect); + draw_cga(screen->machine, bitmap, cliprect); } return 0; } diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c index 71f09f746a8..89a5774137a 100644 --- a/src/mame/drivers/megatech.c +++ b/src/mame/drivers/megatech.c @@ -610,13 +610,13 @@ static VIDEO_START(mtnew) //attotime_never static VIDEO_UPDATE(mtnew) { - if (screen ==0) + if (scrnum ==0) { /* if we're running an sms game then use the SMS update.. maybe this should be moved to the megadrive emulation core as compatibility mode is a feature of the chip */ if (!current_game_is_sms) VIDEO_UPDATE_CALL(megadriv); else VIDEO_UPDATE_CALL(megatech_md_sms); } - else if (screen ==1) VIDEO_UPDATE_CALL(megatech_bios); + else if (scrnum ==1) VIDEO_UPDATE_CALL(megatech_bios); return 0; } diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c index 622d544e347..fb0471ca991 100644 --- a/src/mame/drivers/mgolf.c +++ b/src/mame/drivers/mgolf.c @@ -51,7 +51,7 @@ static VIDEO_UPDATE( mgolf ) for (i = 0; i < 2; i++) { - drawgfx(bitmap, machine->gfx[1], + drawgfx(bitmap, screen->machine->gfx[1], mgolf_video_ram[0x399 + 4 * i], i, 0, 0, @@ -59,7 +59,7 @@ static VIDEO_UPDATE( mgolf ) mgolf_video_ram[0x398 + 4 * i] - 16, cliprect, TRANSPARENCY_PEN, 0); - drawgfx(bitmap, machine->gfx[1], + drawgfx(bitmap, screen->machine->gfx[1], mgolf_video_ram[0x39b + 4 * i], i, 0, 0, diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c index e2fb5eb8a79..67764c962a3 100644 --- a/src/mame/drivers/midas.c +++ b/src/mame/drivers/midas.c @@ -172,7 +172,7 @@ static VIDEO_UPDATE( livequiz ) fillbitmap(bitmap,4095,cliprect); - if (layers_ctrl & 2) draw_sprites(machine, bitmap,cliprect); + if (layers_ctrl & 2) draw_sprites(screen->machine, bitmap,cliprect); if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect, tmap, 0, 0); return 0; diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c index 8db6447edb1..ff9f4935665 100644 --- a/src/mame/drivers/mirage.c +++ b/src/mame/drivers/mirage.c @@ -126,7 +126,7 @@ static VIDEO_UPDATE(mirage) deco16_tilemap_2_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE,0); deco16_tilemap_1_draw(bitmap,cliprect,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/drivers/mirax.c b/src/mame/drivers/mirax.c index 4e394a5b1d1..f364fe4b9bb 100644 --- a/src/mame/drivers/mirax.c +++ b/src/mame/drivers/mirax.c @@ -78,7 +78,7 @@ static VIDEO_UPDATE(mirax) //audio tester if(input_code_pressed_once(KEYCODE_Q)) { - cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, PULSE_LINE); + cpunum_set_input_line(screen->machine, 0, INPUT_LINE_NMI, PULSE_LINE); } #endif return 0; diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c index b45d28d2cb2..4ec631e6a49 100644 --- a/src/mame/drivers/missb2.c +++ b/src/mame/drivers/missb2.c @@ -46,8 +46,7 @@ static VIDEO_UPDATE( missb2 ) /* and sprites) are stored in the same memory region, and information on */ /* the background character columns is stored in the area dd00-dd3f */ - /* This clears & redraws the entire screen each pass */ - fillbitmap(bitmap,255,&machine->screen[0].visarea); + fillbitmap(bitmap,255,cliprect); if (!bublbobl_video_enable) return 0; @@ -55,12 +54,12 @@ static VIDEO_UPDATE( missb2 ) //popmessage("%02x",(*missb2_bgvram) & 0x1f); for(bg_offs = ((*missb2_bgvram) << 4);bg_offs<(((*missb2_bgvram)<< 4)|0xf);bg_offs++) { - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], bg_offs, 1, 0,0, 0,(bg_offs & 0xf) * 0x10, - &machine->screen[0].visarea,TRANSPARENCY_NONE,0xff); + cliprect,TRANSPARENCY_NONE,0xff); } @@ -115,12 +114,12 @@ static VIDEO_UPDATE( missb2 ) flipy = !flipy; } - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], code, 0, flipx,flipy, x,y, - &machine->screen[0].visarea,TRANSPARENCY_PEN,0xff); + cliprect,TRANSPARENCY_PEN,0xff); } } diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c index 4766ef7ee77..c14e99def56 100644 --- a/src/mame/drivers/mlanding.c +++ b/src/mame/drivers/mlanding.c @@ -210,9 +210,9 @@ static VIDEO_START(mlanding) static VIDEO_UPDATE(mlanding) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); - updateChars(machine); + updateChars(screen->machine); { int i,dx,dy,j,k,num; @@ -245,7 +245,7 @@ static VIDEO_UPDATE(mlanding) //test if(code) { - drawgfx(ml_bitmap[num],machine->gfx[0], + drawgfx(ml_bitmap[num],screen->machine->gfx[0], code++, 0, 0,0, diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c index 0497c57d999..1130b992628 100644 --- a/src/mame/drivers/mogura.c +++ b/src/mame/drivers/mogura.c @@ -62,17 +62,17 @@ static VIDEO_UPDATE( mogura ) { /* tilemap layout is a bit strange ... */ rectangle clip; - clip.min_x = machine->screen[0].visarea.min_x; + clip.min_x = screen->machine->screen[0].visarea.min_x; clip.max_x = 256-1; - clip.min_y = machine->screen[0].visarea.min_y; - clip.max_y = machine->screen[0].visarea.max_y; + clip.min_y = screen->machine->screen[0].visarea.min_y; + clip.max_y = screen->machine->screen[0].visarea.max_y; tilemap_set_scrollx(mogura_tilemap,0, 256); tilemap_draw(bitmap,&clip,mogura_tilemap,0,0); clip.min_x = 256; clip.max_x = 512-1; - clip.min_y = machine->screen[0].visarea.min_y; - clip.max_y = machine->screen[0].visarea.max_y; + clip.min_y = screen->machine->screen[0].visarea.min_y; + clip.max_y = screen->machine->screen[0].visarea.max_y; tilemap_set_scrollx(mogura_tilemap,0, -128); tilemap_draw(bitmap,&clip,mogura_tilemap,0,0); diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c index 1de1b9a6554..be7ccb3a4d5 100644 --- a/src/mame/drivers/mpu4drvr.c +++ b/src/mame/drivers/mpu4drvr.c @@ -461,10 +461,10 @@ static VIDEO_UPDATE( mpu4_vid ) { if (mpu4_vid_vidram_is_dirty[i]==1) { - decodechar(machine->gfx[mpu4_gfx_index+0], i, (UINT8 *)mpu4_vid_vidram); - decodechar(machine->gfx[mpu4_gfx_index+1], i, (UINT8 *)mpu4_vid_vidram); - decodechar(machine->gfx[mpu4_gfx_index+2], i, (UINT8 *)mpu4_vid_vidram); - decodechar(machine->gfx[mpu4_gfx_index+3], i, (UINT8 *)mpu4_vid_vidram); + decodechar(screen->machine->gfx[mpu4_gfx_index+0], i, (UINT8 *)mpu4_vid_vidram); + decodechar(screen->machine->gfx[mpu4_gfx_index+1], i, (UINT8 *)mpu4_vid_vidram); + decodechar(screen->machine->gfx[mpu4_gfx_index+2], i, (UINT8 *)mpu4_vid_vidram); + decodechar(screen->machine->gfx[mpu4_gfx_index+3], i, (UINT8 *)mpu4_vid_vidram); mpu4_vid_vidram_is_dirty[i]=0; } } @@ -497,7 +497,7 @@ static VIDEO_UPDATE( mpu4_vid ) colattr = tiledat >>12; tiledat &= 0x0fff; - drawgfx(bitmap,machine->gfx[gfxregion],tiledat,colattr,0,0,x*8,y*8,cliprect,TRANSPARENCY_NONE,0); + drawgfx(bitmap,screen->machine->gfx[gfxregion],tiledat,colattr,0,0,x*8,y*8,cliprect,TRANSPARENCY_NONE,0); count++; } @@ -1551,7 +1551,7 @@ static VIDEO_UPDATE(dealem) { int tile = dealem_videoram[count+0x1000] | (dealem_videoram[count] << 8); count++; - drawgfx(bitmap,machine->gfx[0],tile,0,0,0,x*8,y*8,cliprect,TRANSPARENCY_NONE,0); + drawgfx(bitmap,screen->machine->gfx[0],tile,0,0,0,x*8,y*8,cliprect,TRANSPARENCY_NONE,0); } } diff --git a/src/mame/drivers/murogem.c b/src/mame/drivers/murogem.c index c8edffeb69f..db8de534268 100644 --- a/src/mame/drivers/murogem.c +++ b/src/mame/drivers/murogem.c @@ -180,7 +180,7 @@ static VIDEO_UPDATE(murogem) int tileno = murogem_videoram[count]&0x3f; int attr = murogem_videoram[count+0x400]&0x0f; - drawgfx(bitmap,machine->gfx[0],tileno,attr,0,0,xx*8,yy*8,cliprect,TRANSPARENCY_PEN,0); + drawgfx(bitmap,screen->machine->gfx[0],tileno,attr,0,0,xx*8,yy*8,cliprect,TRANSPARENCY_PEN,0); count++; diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c index d03a502359e..0432757b730 100644 --- a/src/mame/drivers/mwarr.c +++ b/src/mame/drivers/mwarr.c @@ -446,7 +446,7 @@ static VIDEO_UPDATE( mwarr ) tilemap_draw(bitmap,cliprect,mlow_tilemap, 0,0x02); tilemap_draw(bitmap,cliprect,mhigh_tilemap,0,0x04); tilemap_draw(bitmap,cliprect,tx_tilemap, 0,0x10); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index abf1e053605..34d058c27ef 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -468,7 +468,7 @@ DrawPoly( bitmap_t *bitmap, const UINT32 *pSource, int n, int bNew ) static VIDEO_UPDATE( ss23 ) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); fillbitmap(priority_bitmap, 0, cliprect); tilemap_mark_all_tiles_dirty(bgtilemap); diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c index 24c07fe4345..80a3b9867e2 100644 --- a/src/mame/drivers/nmg5.c +++ b/src/mame/drivers/nmg5.c @@ -881,33 +881,33 @@ static VIDEO_UPDATE( nmg5 ) if(priority_reg == 0) { - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); draw_bitmap(bitmap); } else if(priority_reg == 1) { draw_bitmap(bitmap); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); } else if(priority_reg == 2) { - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); draw_bitmap(bitmap); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); } else if(priority_reg == 3) { tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); draw_bitmap(bitmap); } else if(priority_reg == 7) { tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); draw_bitmap(bitmap); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); } return 0; } diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c index 7b4f4079fa7..ed9882e7e76 100644 --- a/src/mame/drivers/nwk-tr.c +++ b/src/mame/drivers/nwk-tr.c @@ -537,11 +537,11 @@ static VIDEO_START( nwktr ) static VIDEO_UPDATE( nwktr ) { - fillbitmap(bitmap, machine->pens[0], cliprect); + fillbitmap(bitmap, screen->machine->pens[0], cliprect); voodoo_update(0, bitmap, cliprect); - K001604_tile_update(machine, 0); + K001604_tile_update(screen->machine, 0); K001604_draw_front_layer(0, bitmap, cliprect); draw_7segment_led(bitmap, 3, 3, led_reg0); diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c index cc7f63b0e51..a551d1adebf 100644 --- a/src/mame/drivers/nyny.c +++ b/src/mame/drivers/nyny.c @@ -417,7 +417,7 @@ static const mc6845_interface mc6845_intf = static VIDEO_UPDATE( nyny ) { - const device_config *mc6845 = device_list_find_by_tag(machine->config->devicelist, MC6845, "crtc"); + const device_config *mc6845 = device_list_find_by_tag(screen->machine->config->devicelist, MC6845, "crtc"); mc6845_update(mc6845, bitmap, cliprect); return 0; diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c index 5dadc432cb7..924e1d73c6f 100644 --- a/src/mame/drivers/olibochu.c +++ b/src/mame/drivers/olibochu.c @@ -156,7 +156,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta static VIDEO_UPDATE( olibochu ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c index a5cf9790640..451f2d2fa26 100644 --- a/src/mame/drivers/panicr.c +++ b/src/mame/drivers/panicr.c @@ -220,11 +220,11 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan static VIDEO_UPDATE( panicr) { - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); tilemap_mark_all_tiles_dirty( txttilemap ); tilemap_set_scrollx( bgtilemap,0, ((scrollram[0x02]&0x0f)<<12)+((scrollram[0x02]&0xf0)<<4)+((scrollram[0x04]&0x7f)<<1)+((scrollram[0x04]&0x80)>>7) ); tilemap_draw(bitmap,cliprect,bgtilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,txttilemap,0,0); return 0; diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c index 0d4745a6856..e801da93e97 100644 --- a/src/mame/drivers/powerbal.c +++ b/src/mame/drivers/powerbal.c @@ -374,7 +374,7 @@ static VIDEO_START( powerbal ) static VIDEO_UPDATE( powerbal ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c index 3110b31bec0..53db1e4e943 100644 --- a/src/mame/drivers/pturn.c +++ b/src/mame/drivers/pturn.c @@ -132,7 +132,7 @@ static VIDEO_UPDATE(pturn) int sx, sy; int flipx, flipy; - fillbitmap(bitmap, bgcolor, &machine->screen[0].visarea); + fillbitmap(bitmap, bgcolor, cliprect); tilemap_draw(bitmap,cliprect,pturn_bgmap,0,0); for ( offs = 0x80-4 ; offs >=0 ; offs -= 4) { @@ -157,7 +157,7 @@ static VIDEO_UPDATE(pturn) if(sx|sy) { - drawgfx(bitmap, machine->gfx[2], + drawgfx(bitmap, screen->machine->gfx[2], spriteram[offs+1] & 0x3f , (spriteram[offs+2] & 0x1f), flipx, flipy, diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c index d281da7d850..57c149296a7 100644 --- a/src/mame/drivers/r2dtank.c +++ b/src/mame/drivers/r2dtank.c @@ -395,7 +395,7 @@ static const mc6845_interface mc6845_intf = static VIDEO_UPDATE( r2dtank ) { - const device_config *mc6845 = device_list_find_by_tag(machine->config->devicelist, MC6845, "crtc"); + const device_config *mc6845 = device_list_find_by_tag(screen->machine->config->devicelist, MC6845, "crtc"); mc6845_update(mc6845, bitmap, cliprect); return 0; diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c index 331f776b4cf..5d5ba0c40b9 100644 --- a/src/mame/drivers/rabbit.c +++ b/src/mame/drivers/rabbit.c @@ -410,7 +410,7 @@ static VIDEO_UPDATE(rabbit) { int prilevel; - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); // popmessage("%08x %08x", rabbit_viewregs0[0], rabbit_viewregs0[1]); // popmessage("%08x %08x %08x %08x %08x %08x", rabbit_tilemap_regs[0][0],rabbit_tilemap_regs[0][1],rabbit_tilemap_regs[0][2],rabbit_tilemap_regs[0][3],rabbit_tilemap_regs[0][4],rabbit_tilemap_regs[0][5]); @@ -436,7 +436,7 @@ static VIDEO_UPDATE(rabbit) if (prilevel == 0x09) // should it be selectable? { rabbit_clearspritebitmap(bitmap,cliprect); - draw_sprites(machine,bitmap,cliprect); // render to bitmap + draw_sprites(screen->machine,bitmap,cliprect); // render to bitmap draw_sprite_bitmap(bitmap,cliprect); // copy bitmap to screen } } @@ -1172,7 +1172,7 @@ static VIDEO_UPDATE( tmmjprd ) // popmessage("%08x %08x %08x %08x %08x", rabbit_viewregs10[0],rabbit_viewregs10[1],rabbit_viewregs10[2],rabbit_viewregs10[3],rabbit_viewregs10[4]); - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); tilemap_draw(bitmap,cliprect,rabbit_tilemap[3],0,0); tilemap_draw(bitmap,cliprect,rabbit_tilemap[1],0,0); //same as 3? tilemap_draw(bitmap,cliprect,rabbit_tilemap[2],0,0); diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index 686619cc5a0..069debbd8d0 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -448,7 +448,7 @@ static VIDEO_UPDATE ( raiden2 ) #endif #endif - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); if (!input_code_pressed(KEYCODE_Q)) tilemap_draw(bitmap, cliprect, background_layer, 0, 0); @@ -457,7 +457,7 @@ static VIDEO_UPDATE ( raiden2 ) if (!input_code_pressed(KEYCODE_E)) tilemap_draw(bitmap, cliprect, foreground_layer, 0, 0); - draw_sprites(machine, bitmap, cliprect, 0); + draw_sprites(screen->machine, bitmap, cliprect, 0); if (!input_code_pressed(KEYCODE_A)) tilemap_draw(bitmap, cliprect, text_layer, 0, 0); diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c index 51b56e7ad56..d7376beca63 100644 --- a/src/mame/drivers/rbmk.c +++ b/src/mame/drivers/rbmk.c @@ -459,7 +459,7 @@ static VIDEO_UPDATE(rbmk) for (x=0;x<64;x++) { int tile = gms_vidram2[count+0x600]; - drawgfx(bitmap,machine->gfx[0],(tile&0xfff)+((tilebank&0x10)>>4)*0x1000,tile>>12,0,0,x*8,y*32,cliprect,TRANSPARENCY_NONE,0); + drawgfx(bitmap,screen->machine->gfx[0],(tile&0xfff)+((tilebank&0x10)>>4)*0x1000,tile>>12,0,0,x*8,y*32,cliprect,TRANSPARENCY_NONE,0); count++; } } @@ -471,7 +471,7 @@ static VIDEO_UPDATE(rbmk) for (x=0;x<64;x++) { int tile = gms_vidram[count]; - drawgfx(bitmap,machine->gfx[1],(tile&0xfff)+((tilebank>>1)&3)*0x1000,tile>>12,0,0,x*8,y*8,cliprect,TRANSPARENCY_PEN,0); + drawgfx(bitmap,screen->machine->gfx[1],(tile&0xfff)+((tilebank>>1)&3)*0x1000,tile>>12,0,0,x*8,y*8,cliprect,TRANSPARENCY_PEN,0); count++; } } diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c index 8ed4ab70205..c12ee56b336 100644 --- a/src/mame/drivers/rmhaihai.c +++ b/src/mame/drivers/rmhaihai.c @@ -64,7 +64,7 @@ static VIDEO_START( rmhaihai ) static VIDEO_UPDATE( rmhaihai ) { - tilemap_draw(bitmap, &machine->screen[0].visarea, bg_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; } diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c index 50d21041f90..935c885d0f8 100644 --- a/src/mame/drivers/sbrkout.c +++ b/src/mame/drivers/sbrkout.c @@ -316,7 +316,7 @@ static VIDEO_UPDATE( sbrkout ) int sx = 31 * 8 - videoram[0x380 + 0x10 + ball * 2]; int sy = 30 * 8 - videoram[0x380 + 0x18 + ball * 2]; - drawgfx(bitmap, machine->gfx[1], code, 0, 0, 0, sx, sy, cliprect, TRANSPARENCY_PEN, 0); + drawgfx(bitmap, screen->machine->gfx[1], code, 0, 0, 0, sx, sy, cliprect, TRANSPARENCY_PEN, 0); } return 0; } diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c index ca613429442..2cb8a214b0e 100644 --- a/src/mame/drivers/segald.c +++ b/src/mame/drivers/segald.c @@ -82,7 +82,7 @@ static VIDEO_UPDATE( astron ) { fillbitmap(bitmap, 0, cliprect); - astron_draw_characters(machine, bitmap, cliprect); + astron_draw_characters(screen->machine, bitmap, cliprect); astron_draw_sprites(bitmap, cliprect); /* display disc information */ diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c index 18d4875fd80..da2efe21463 100644 --- a/src/mame/drivers/skyarmy.c +++ b/src/mame/drivers/skyarmy.c @@ -129,7 +129,7 @@ static VIDEO_UPDATE( skyarmy ) sy = 242-spriteram[offs]; flipy = (spriteram[offs+1]&0x80)>>7; flipx = (spriteram[offs+1]&0x40)>>6; - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], spriteram[offs+1]&0x3f, pal, flipx,flipy, diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c index d2a7ea99860..b719325c7c6 100644 --- a/src/mame/drivers/snowbros.c +++ b/src/mame/drivers/snowbros.c @@ -83,8 +83,8 @@ static WRITE16_HANDLER( snowbros_flipscreen_w ) static VIDEO_UPDATE( snowbros ) { /* This clears & redraws the entire screen each pass */ - fillbitmap(bitmap,0xf0,&machine->screen[0].visarea); - pandora_update(machine,bitmap,cliprect); + fillbitmap(bitmap,0xf0,cliprect); + pandora_update(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/drivers/spiders.c b/src/mame/drivers/spiders.c index 710659063c6..e30763f0b06 100644 --- a/src/mame/drivers/spiders.c +++ b/src/mame/drivers/spiders.c @@ -511,7 +511,7 @@ static const mc6845_interface mc6845_intf = static VIDEO_UPDATE( spiders ) { - const device_config *mc6845 = device_list_find_by_tag(machine->config->devicelist, MC6845, "crtc"); + const device_config *mc6845 = device_list_find_by_tag(screen->machine->config->devicelist, MC6845, "crtc"); mc6845_update(mc6845, bitmap, cliprect); return 0; diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c index 1bb25331d79..7e4b00dcc30 100644 --- a/src/mame/drivers/srmp5.c +++ b/src/mame/drivers/srmp5.c @@ -68,7 +68,7 @@ static VIDEO_UPDATE( srmp5 ) UINT16 *sprite_list_end=&sprram[0x1000]; //guess UINT8 *pixels=(UINT8 *)tileram; - fillbitmap(bitmap,0,&machine->screen[0].visarea); + fillbitmap(bitmap,0,cliprect); while((sprite_list[SUBLIST_OFFSET]&SPRITE_LIST_END_MARKER)==0 && sprite_list<sprite_list_end) { @@ -105,7 +105,7 @@ static VIDEO_UPDATE( srmp5 ) if(pen) { - if(xb+xs<=machine->screen[0].visarea.max_x && xb+xs>=machine->screen[0].visarea.min_x && yb+ys<=machine->screen[0].visarea.max_y && yb+ys>=machine->screen[0].visarea.min_y ) + if(xb+xs<=screen->machine->screen[0].visarea.max_x && xb+xs>=screen->machine->screen[0].visarea.min_x && yb+ys<=screen->machine->screen[0].visarea.max_y && yb+ys>=screen->machine->screen[0].visarea.min_y ) { UINT32 pixdata=paletteram32[pen+((sprite_sublist[SPRITE_PALETTE]&0xff)<<8)]; *BITMAP_ADDR32(bitmap, yb+ys, xb+xs) = ((pixdata&0x7c00)>>7) | ((pixdata&0x3e0)<<6) | ((pixdata&0x1f)<<19); diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c index 9c50aa34305..2818e8feb7c 100644 --- a/src/mame/drivers/srmp6.c +++ b/src/mame/drivers/srmp6.c @@ -177,7 +177,7 @@ static VIDEO_UPDATE(srmp6) UINT16 b; } temp; - fillbitmap(bitmap,0,&machine->screen[0].visarea); + fillbitmap(bitmap,0,cliprect); #if 0 /* debug */ @@ -273,11 +273,11 @@ static VIDEO_UPDATE(srmp6) if (dirty_tileram[tileno]) { - decodechar(machine->gfx[0], tileno, (UINT8*)tileram); + decodechar(screen->machine->gfx[0], tileno, (UINT8*)tileram); dirty_tileram[tileno] = 0; } - drawgfx(bitmap,machine->gfx[0],tileno,global_pal,flip_x,flip_y,xb,yb,cliprect,trans,0); + drawgfx(bitmap,screen->machine->gfx[0],tileno,global_pal,flip_x,flip_y,xb,yb,cliprect,trans,0); tileno++; } } diff --git a/src/mame/drivers/ssingles.c b/src/mame/drivers/ssingles.c index 7dfb904d281..8e6d554eb11 100644 --- a/src/mame/drivers/ssingles.c +++ b/src/mame/drivers/ssingles.c @@ -120,7 +120,7 @@ static VIDEO_START(ssingles) static VIDEO_UPDATE( ssingles ) { - const device_config *mc6845 = device_list_find_by_tag(machine->config->devicelist, MC6845, "crtc"); + const device_config *mc6845 = device_list_find_by_tag(screen->machine->config->devicelist, MC6845, "crtc"); mc6845_update(mc6845, bitmap, cliprect); return 0; diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c index f5c55cbae31..95e3ea34fc2 100644 --- a/src/mame/drivers/superdq.c +++ b/src/mame/drivers/superdq.c @@ -67,7 +67,7 @@ static VIDEO_UPDATE( superdq ) if (!video_skip_this_frame() && discinfo != NULL) { bitmap_t *vidbitmap; - rectangle fixedvis = machine->screen[screen].visarea; + rectangle fixedvis = screen->machine->screen[scrnum].visarea; fixedvis.max_x++; fixedvis.max_y++; @@ -87,9 +87,9 @@ static VIDEO_UPDATE( superdq ) render_texture_set_bitmap(overlay_texture, bitmap, &fixedvis, 0, TEXFORMAT_PALETTEA16); /* add both quads to the screen */ - render_container_empty(render_container_get_screen(screen)); - render_screen_add_quad(screen, 0.0f, 0.0f, 1.0f, 1.0f, MAKE_ARGB(0xff,0xff,0xff,0xff), video_texture, PRIMFLAG_BLENDMODE(BLENDMODE_NONE) | PRIMFLAG_SCREENTEX(1)); - render_screen_add_quad(screen, 0.0f, 0.0f, 1.0f, 1.0f, MAKE_ARGB(0xff,0xff,0xff,0xff), overlay_texture, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA) | PRIMFLAG_SCREENTEX(1)); + render_container_empty(render_container_get_screen(scrnum)); + render_screen_add_quad(scrnum, 0.0f, 0.0f, 1.0f, 1.0f, MAKE_ARGB(0xff,0xff,0xff,0xff), video_texture, PRIMFLAG_BLENDMODE(BLENDMODE_NONE) | PRIMFLAG_SCREENTEX(1)); + render_screen_add_quad(scrnum, 0.0f, 0.0f, 1.0f, 1.0f, MAKE_ARGB(0xff,0xff,0xff,0xff), overlay_texture, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA) | PRIMFLAG_SCREENTEX(1)); } /* display disc information */ diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c index 10abe491e1c..42cd62400ca 100644 --- a/src/mame/drivers/taitowlf.c +++ b/src/mame/drivers/taitowlf.c @@ -61,7 +61,7 @@ static void draw_char(running_machine *machine, bitmap_t *bitmap, const rectangl static VIDEO_UPDATE(taitowlf) { int i, j; - const gfx_element *gfx = machine->gfx[0]; + const gfx_element *gfx = screen->machine->gfx[0]; UINT32 *cga = cga_ram; int index = 0; @@ -76,8 +76,8 @@ static VIDEO_UPDATE(taitowlf) int att1 = (cga[index] >> 24) & 0xff; int ch1 = (cga[index] >> 16) & 0xff; - draw_char(machine, bitmap, cliprect, gfx, ch0, att0, i*8, j*8); - draw_char(machine, bitmap, cliprect, gfx, ch1, att1, (i*8)+8, j*8); + draw_char(screen->machine, bitmap, cliprect, gfx, ch0, att0, i*8, j*8); + draw_char(screen->machine, bitmap, cliprect, gfx, ch1, att1, (i*8)+8, j*8); index++; } } diff --git a/src/mame/drivers/talbot.c b/src/mame/drivers/talbot.c index f6dbc0db988..9a9a24bf9b5 100644 --- a/src/mame/drivers/talbot.c +++ b/src/mame/drivers/talbot.c @@ -184,7 +184,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta static VIDEO_UPDATE( talbot ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c index b59865aad58..e3a36559afa 100644 --- a/src/mame/drivers/tecmosys.c +++ b/src/mame/drivers/tecmosys.c @@ -445,9 +445,9 @@ static VIDEO_UPDATE(deroon) // bg color , to see text in deroon if(!gametype) - palette_set_color(machine,0x800,MAKE_RGB(0x80,0x80,0x80)); + palette_set_color(screen->machine,0x800,MAKE_RGB(0x80,0x80,0x80)); else - palette_set_color(machine,0x800,MAKE_RGB(0x0,0x0,0x0)); + palette_set_color(screen->machine,0x800,MAKE_RGB(0x0,0x0,0x0)); fillbitmap(bitmap,0x800,cliprect); diff --git a/src/mame/drivers/tetriunk.c b/src/mame/drivers/tetriunk.c index 6fef32c1cd9..445a3c6c2f2 100644 --- a/src/mame/drivers/tetriunk.c +++ b/src/mame/drivers/tetriunk.c @@ -119,9 +119,9 @@ static VIDEO_UPDATE(tetriunk) int color2 = (tetriunk_attribram[count<<1]>>4)&7; if(color2!=0) { - drawgfx(bitmap,machine->gfx[0],0x100,color2,0,0,x<<3,y<<3,cliprect,TRANSPARENCY_NONE,0); + drawgfx(bitmap,screen->machine->gfx[0],0x100,color2,0,0,x<<3,y<<3,cliprect,TRANSPARENCY_NONE,0); } - drawgfx(bitmap,machine->gfx[0],tile&0xff,color,0,0,x<<3,y<<3,cliprect,TRANSPARENCY_PEN,0); + drawgfx(bitmap,screen->machine->gfx[0],tile&0xff,color,0,0,x<<3,y<<3,cliprect,TRANSPARENCY_PEN,0); count++; } } diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c index 4998e5f9b47..6cd104fe8b4 100644 --- a/src/mame/drivers/tmaster.c +++ b/src/mame/drivers/tmaster.c @@ -222,10 +222,10 @@ static VIDEO_UPDATE( tmaster ) #endif - if (layers_ctrl & 1) copybitmap (bitmap,tmaster_bitmap[0][(tmaster_regs[0x02/2]>>8)&1],0,0,0,0,&machine->screen[0].visarea); - else fillbitmap(bitmap,get_black_pen(machine),cliprect); + if (layers_ctrl & 1) copybitmap (bitmap,tmaster_bitmap[0][(tmaster_regs[0x02/2]>>8)&1],0,0,0,0,cliprect); + else fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); - if (layers_ctrl & 2) copybitmap_trans (bitmap,tmaster_bitmap[1][(tmaster_regs[0x02/2]>>9)&1],0,0,0,0,&machine->screen[0].visarea,0xff); + if (layers_ctrl & 2) copybitmap_trans (bitmap,tmaster_bitmap[1][(tmaster_regs[0x02/2]>>9)&1],0,0,0,0,cliprect,0xff); return 0; } diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c index 3fa33c3c51b..97ebe902cb0 100644 --- a/src/mame/drivers/ttchamp.c +++ b/src/mame/drivers/ttchamp.c @@ -57,7 +57,7 @@ static VIDEO_UPDATE(ttchamp) // int i; static int xxx=320,yyy=204; - fillbitmap(bitmap, get_black_pen(machine), 0); + fillbitmap(bitmap, get_black_pen(screen->machine), 0); // for (i=0;i<256;i++) // { diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c index 046d018aeb8..bce8ce68877 100644 --- a/src/mame/drivers/tugboat.c +++ b/src/mame/drivers/tugboat.c @@ -119,8 +119,8 @@ static VIDEO_UPDATE( tugboat ) int startaddr1 = hd46505_1_reg[0x0c]*256 + hd46505_1_reg[0x0d]; - draw_tilemap(machine, bitmap,cliprect,startaddr0,0,1,TRANSPARENCY_NONE); - draw_tilemap(machine, bitmap,cliprect,startaddr1,2,3,TRANSPARENCY_PEN); + draw_tilemap(screen->machine, bitmap,cliprect,startaddr0,0,1,TRANSPARENCY_NONE); + draw_tilemap(screen->machine, bitmap,cliprect,startaddr1,2,3,TRANSPARENCY_PEN); return 0; } diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c index 9e000b82a81..9eabdd73c89 100644 --- a/src/mame/drivers/twins.c +++ b/src/mame/drivers/twins.c @@ -102,7 +102,7 @@ static VIDEO_UPDATE(twins) int i; static int xxx=320,yyy=204; - fillbitmap(bitmap, get_black_pen(machine), 0); + fillbitmap(bitmap, get_black_pen(screen->machine), 0); for (i=0;i<0x100;i++) { @@ -118,7 +118,7 @@ static VIDEO_UPDATE(twins) b = (dat>>10) & 0x1f; b = BITSWAP8(b,7,6,5,0,1,2,3,4); - palette_set_color_rgb(machine,i, pal5bit(r),pal5bit(g),pal5bit(b)); + palette_set_color_rgb(screen->machine,i, pal5bit(r),pal5bit(g),pal5bit(b)); } count=0; @@ -205,7 +205,7 @@ static VIDEO_UPDATE(twinsa) int i; static int xxx=320,yyy=204; - fillbitmap(bitmap, get_black_pen(machine), 0); + fillbitmap(bitmap, get_black_pen(screen->machine), 0); for (i=0;i<0x1000-3;i+=3) { @@ -214,7 +214,7 @@ static VIDEO_UPDATE(twinsa) g = twins_pal[i+1]; b = twins_pal[i+2]; - palette_set_color_rgb(machine,i/3, pal6bit(r), pal6bit(g), pal6bit(b)); + palette_set_color_rgb(screen->machine,i/3, pal6bit(r), pal6bit(g), pal6bit(b)); } count=0; diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c index 78223c6606c..1cf0eec5663 100644 --- a/src/mame/drivers/ultrsprt.c +++ b/src/mame/drivers/ultrsprt.c @@ -36,11 +36,11 @@ static VIDEO_UPDATE( ultrsprt ) if (p1 == 0) { UINT8 p2 = ram[BYTE4_XOR_BE(fb_index + i)]; - bmp[i] = machine->pens[0x000 + p2]; + bmp[i] = screen->machine->pens[0x000 + p2]; } else { - bmp[i] = machine->pens[0x100 + p1]; + bmp[i] = screen->machine->pens[0x100 + p1]; } } } diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c index 48982edd28a..e84f45de568 100644 --- a/src/mame/drivers/vamphalf.c +++ b/src/mame/drivers/vamphalf.c @@ -430,7 +430,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, int scrnum) static VIDEO_UPDATE( common ) { fillbitmap(bitmap,0,cliprect); - draw_sprites(machine, bitmap, screen); + draw_sprites(screen->machine, bitmap, scrnum); return 0; } diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c index 7b641760fd8..a5e4015ec77 100644 --- a/src/mame/drivers/vmetal.c +++ b/src/mame/drivers/vmetal.c @@ -406,7 +406,7 @@ static VIDEO_START(varia) static VIDEO_UPDATE(varia) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); fillbitmap(priority_bitmap,0,cliprect); tilemap_set_scrollx(vmetal_mid2tilemap,0, vmetal_videoregs[0x06a/2]-64 /*+ vmetal_videoregs[0x066/2]*/); @@ -419,7 +419,7 @@ static VIDEO_UPDATE(varia) tilemap_draw(bitmap,cliprect,vmetal_mid1tilemap,0,0); tilemap_draw(bitmap,cliprect,vmetal_mid2tilemap,0,0); - metro_draw_sprites(machine, bitmap,cliprect); + metro_draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,vmetal_texttilemap,0,0); return 0; } diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c index 4c9ad1c8382..fbaebd6a14f 100644 --- a/src/mame/drivers/vroulet.c +++ b/src/mame/drivers/vroulet.c @@ -94,7 +94,7 @@ static VIDEO_START(vroulet) static VIDEO_UPDATE(vroulet) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - drawgfx(bitmap, machine->gfx[0], 0x320, 1, 0, 0, + drawgfx(bitmap, screen->machine->gfx[0], 0x320, 1, 0, 0, vroulet_ball[1], vroulet_ball[0] - 12, cliprect, TRANSPARENCY_PEN, 0); return 0; } diff --git a/src/mame/drivers/wheelfir.c b/src/mame/drivers/wheelfir.c index cde432dee27..ddc87bcb097 100644 --- a/src/mame/drivers/wheelfir.c +++ b/src/mame/drivers/wheelfir.c @@ -338,7 +338,7 @@ static VIDEO_UPDATE(wheelfir) r = wheelfir_palette[x]; g = wheelfir_palette[x+1]; b = wheelfir_palette[x+2]; - palette_set_color(machine,x/3,MAKE_RGB(r,g,b)); + palette_set_color(screen->machine,x/3,MAKE_RGB(r,g,b)); } } /* diff --git a/src/mame/drivers/wilytowr.c b/src/mame/drivers/wilytowr.c index ea3765fc546..000f82fc3dc 100644 --- a/src/mame/drivers/wilytowr.c +++ b/src/mame/drivers/wilytowr.c @@ -204,7 +204,7 @@ static VIDEO_UPDATE( wilytowr ) tilemap_set_scrolly(bg_tilemap, col, wilytowr_scrollram[col * 8]); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); return 0; } diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c index 0c39c48a84e..5a42eca796f 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -751,7 +751,7 @@ static VIDEO_UPDATE(witch) tilemap_draw(bitmap,cliprect,gfx1_tilemap,0,0); tilemap_draw(bitmap,cliprect,gfx0a_tilemap,0,0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap,cliprect,gfx0b_tilemap,0,0); return 0; } diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c index 05e2a1b27c7..884061ba1b8 100644 --- a/src/mame/drivers/zr107.c +++ b/src/mame/drivers/zr107.c @@ -91,9 +91,9 @@ static VIDEO_START( jetwave ) static VIDEO_UPDATE( jetwave ) { - fillbitmap(bitmap, machine->pens[0], cliprect); + fillbitmap(bitmap, screen->machine->pens[0], cliprect); - K001604_tile_update(machine, 0); + K001604_tile_update(screen->machine, 0); K001005_draw(bitmap, cliprect); K001604_draw_front_layer(0, bitmap, cliprect); @@ -138,7 +138,7 @@ static VIDEO_START( zr107 ) static VIDEO_UPDATE( zr107 ) { - fillbitmap(bitmap, machine->pens[0], cliprect); + fillbitmap(bitmap, screen->machine->pens[0], cliprect); K056832_set_LayerOffset(0, -29, -27); K056832_set_LayerOffset(1, -29, -27); @@ -149,9 +149,9 @@ static VIDEO_UPDATE( zr107 ) K056832_set_LayerOffset(6, -29, -27); K056832_set_LayerOffset(7, -29, -27); - K056832_tilemap_draw(machine, bitmap, cliprect, 1, 0, 0); + K056832_tilemap_draw(screen->machine, bitmap, cliprect, 1, 0, 0); K001005_draw(bitmap, cliprect); - K056832_tilemap_draw(machine, bitmap, cliprect, 0, 0, 0); + K056832_tilemap_draw(screen->machine, bitmap, cliprect, 0, 0, 0); draw_7segment_led(bitmap, 3, 3, led_reg0); draw_7segment_led(bitmap, 9, 3, led_reg1); diff --git a/src/mame/video/1942.c b/src/mame/video/1942.c index 9c95b7effe7..2dd7dfecd08 100644 --- a/src/mame/video/1942.c +++ b/src/mame/video/1942.c @@ -243,7 +243,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( 1942 ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); return 0; } diff --git a/src/mame/video/1943.c b/src/mame/video/1943.c index 8fba37f05fc..dc4dfc74494 100644 --- a/src/mame/video/1943.c +++ b/src/mame/video/1943.c @@ -240,11 +240,11 @@ VIDEO_UPDATE( 1943 ) if (sc2on) tilemap_draw(bitmap, cliprect, bg2_tilemap, 0, 0); else - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); - if (objon) draw_sprites(machine, bitmap, cliprect, 0); + if (objon) draw_sprites(screen->machine, bitmap, cliprect, 0); if (sc1on) tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - if (objon) draw_sprites(machine, bitmap, cliprect, 1); + if (objon) draw_sprites(screen->machine, bitmap, cliprect, 1); if (chon) tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/20pacgal.c b/src/mame/video/20pacgal.c index 2f3571dd758..e6d60d06809 100644 --- a/src/mame/video/20pacgal.c +++ b/src/mame/video/20pacgal.c @@ -292,7 +292,7 @@ static void draw_chars(const _20pacgal_state *state, bitmap_t *bitmap) static VIDEO_UPDATE( 20pacgal ) { - const _20pacgal_state *state = machine->driver_data; + const _20pacgal_state *state = screen->machine->driver_data; draw_chars(state, bitmap); draw_sprites(state, bitmap); diff --git a/src/mame/video/40love.c b/src/mame/video/40love.c index 0be25d50122..d6a07e89d3f 100644 --- a/src/mame/video/40love.c +++ b/src/mame/video/40love.c @@ -345,6 +345,6 @@ VIDEO_UPDATE( fortyl ) tilemap_set_scrolldy(background,-fortyl_video_ctrl[1]+1,-fortyl_video_ctrl[1]-1 ); tilemap_draw(bitmap,cliprect,background,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/actfancr.c b/src/mame/video/actfancr.c index 9c9c075977c..7ae638d0f6a 100644 --- a/src/mame/video/actfancr.c +++ b/src/mame/video/actfancr.c @@ -211,7 +211,7 @@ VIDEO_UPDATE( actfancr ) while (multi >= 0) { - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], sprite - multi * inc, colour, fx,fy, @@ -296,7 +296,7 @@ VIDEO_UPDATE( triothep ) while (multi >= 0) { - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], sprite - multi * inc, colour, fx,fy, diff --git a/src/mame/video/aeroboto.c b/src/mame/video/aeroboto.c index b52dfe59f61..527e7c42ad4 100644 --- a/src/mame/video/aeroboto.c +++ b/src/mame/video/aeroboto.c @@ -201,7 +201,7 @@ VIDEO_UPDATE( aeroboto ) tilemap_set_scrolly(bg_tilemap,0,*aeroboto_vscroll); tilemap_draw(bitmap,&splitrect2,bg_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); // the status display behaves more closely to a 40-line splitscreen than an overlay tilemap_set_scrolly(bg_tilemap,0,0); diff --git a/src/mame/video/aerofgt.c b/src/mame/video/aerofgt.c index ffb80c186b8..59c8730fa5b 100644 --- a/src/mame/video/aerofgt.c +++ b/src/mame/video/aerofgt.c @@ -582,8 +582,8 @@ VIDEO_UPDATE( pspikes ) fillbitmap(priority_bitmap,0,cliprect); tilemap_draw(bitmap,cliprect,bg1_tilemap,0,0); - turbofrc_draw_sprites(machine,bitmap,cliprect,0,-1); - turbofrc_draw_sprites(machine,bitmap,cliprect,0, 0); + turbofrc_draw_sprites(screen->machine,bitmap,cliprect,0,-1); + turbofrc_draw_sprites(screen->machine,bitmap,cliprect,0, 0); return 0; } @@ -598,7 +598,7 @@ VIDEO_UPDATE( pspikesb ) tilemap_set_scrolly(bg1_tilemap,0,scrolly); tilemap_draw(bitmap,cliprect,bg1_tilemap,0,0); - pspikesb_draw_sprites(machine,bitmap,cliprect); + pspikesb_draw_sprites(screen->machine,bitmap,cliprect); return 0; } @@ -615,10 +615,10 @@ VIDEO_UPDATE( karatblz ) tilemap_draw(bitmap,cliprect,bg2_tilemap,0,0); /* we use the priority buffer so sprites are drawn front to back */ - turbofrc_draw_sprites(machine,bitmap,cliprect,1,-1); - turbofrc_draw_sprites(machine,bitmap,cliprect,1, 0); - turbofrc_draw_sprites(machine,bitmap,cliprect,0,-1); - turbofrc_draw_sprites(machine,bitmap,cliprect,0, 0); + turbofrc_draw_sprites(screen->machine,bitmap,cliprect,1,-1); + turbofrc_draw_sprites(screen->machine,bitmap,cliprect,1, 0); + turbofrc_draw_sprites(screen->machine,bitmap,cliprect,0,-1); + turbofrc_draw_sprites(screen->machine,bitmap,cliprect,0, 0); return 0; } @@ -640,10 +640,10 @@ VIDEO_UPDATE( spinlbrk ) tilemap_draw(bitmap,cliprect,bg2_tilemap,0,0); /* we use the priority buffer so sprites are drawn front to back */ - turbofrc_draw_sprites(machine,bitmap,cliprect,0,-1); - turbofrc_draw_sprites(machine,bitmap,cliprect,0, 0); - turbofrc_draw_sprites(machine,bitmap,cliprect,1,-1); - turbofrc_draw_sprites(machine,bitmap,cliprect,1, 0); + turbofrc_draw_sprites(screen->machine,bitmap,cliprect,0,-1); + turbofrc_draw_sprites(screen->machine,bitmap,cliprect,0, 0); + turbofrc_draw_sprites(screen->machine,bitmap,cliprect,1,-1); + turbofrc_draw_sprites(screen->machine,bitmap,cliprect,1, 0); return 0; } @@ -666,10 +666,10 @@ VIDEO_UPDATE( turbofrc ) tilemap_draw(bitmap,cliprect,bg2_tilemap,0,1); /* we use the priority buffer so sprites are drawn front to back */ - turbofrc_draw_sprites(machine,bitmap,cliprect,1,-1); //ship - turbofrc_draw_sprites(machine,bitmap,cliprect,1, 0); //intro - turbofrc_draw_sprites(machine,bitmap,cliprect,0,-1); //enemy - turbofrc_draw_sprites(machine,bitmap,cliprect,0, 0); //enemy + turbofrc_draw_sprites(screen->machine,bitmap,cliprect,1,-1); //ship + turbofrc_draw_sprites(screen->machine,bitmap,cliprect,1, 0); //intro + turbofrc_draw_sprites(screen->machine,bitmap,cliprect,0,-1); //enemy + turbofrc_draw_sprites(screen->machine,bitmap,cliprect,0, 0); //enemy return 0; } @@ -684,13 +684,13 @@ VIDEO_UPDATE( aerofgt ) tilemap_draw(bitmap,cliprect,bg1_tilemap,0,0); - aerofgt_draw_sprites(machine,bitmap,cliprect,0); - aerofgt_draw_sprites(machine,bitmap,cliprect,1); + aerofgt_draw_sprites(screen->machine,bitmap,cliprect,0); + aerofgt_draw_sprites(screen->machine,bitmap,cliprect,1); tilemap_draw(bitmap,cliprect,bg2_tilemap,0,0); - aerofgt_draw_sprites(machine,bitmap,cliprect,2); - aerofgt_draw_sprites(machine,bitmap,cliprect,3); + aerofgt_draw_sprites(screen->machine,bitmap,cliprect,2); + aerofgt_draw_sprites(screen->machine,bitmap,cliprect,3); return 0; } @@ -713,7 +713,7 @@ VIDEO_UPDATE( aerfboot ) tilemap_draw(bitmap,cliprect,bg2_tilemap,0,1); /* we use the priority buffer so sprites are drawn front to back */ - aerfboot_draw_sprites(machine,bitmap,cliprect); + aerfboot_draw_sprites(screen->machine,bitmap,cliprect); return 0; } @@ -739,7 +739,7 @@ VIDEO_UPDATE( wbbc97 ) tilemap_draw(bitmap,cliprect,bg1_tilemap,TILEMAP_DRAW_OPAQUE,0); } - turbofrc_draw_sprites(machine,bitmap,cliprect,0,-1); - turbofrc_draw_sprites(machine,bitmap,cliprect,0, 0); + turbofrc_draw_sprites(screen->machine,bitmap,cliprect,0,-1); + turbofrc_draw_sprites(screen->machine,bitmap,cliprect,0, 0); return 0; } diff --git a/src/mame/video/airbustr.c b/src/mame/video/airbustr.c index d2c72127e53..c4d25c5f507 100644 --- a/src/mame/video/airbustr.c +++ b/src/mame/video/airbustr.c @@ -138,7 +138,7 @@ VIDEO_UPDATE( airbustr ) tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); // copy the sprite bitmap to the screen - pandora_update(machine, bitmap, cliprect); + pandora_update(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/ajax.c b/src/mame/video/ajax.c index 360c9dc62ef..b2151884963 100644 --- a/src/mame/video/ajax.c +++ b/src/mame/video/ajax.c @@ -94,7 +94,7 @@ VIDEO_UPDATE( ajax ) fillbitmap(priority_bitmap,0,cliprect); - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); tilemap_draw(bitmap,cliprect,K052109_tilemap[2],0,1); if (ajax_priority) { diff --git a/src/mame/video/alpha68k.c b/src/mame/video/alpha68k.c index be0d2e22035..d6e461518b5 100644 --- a/src/mame/video/alpha68k.c +++ b/src/mame/video/alpha68k.c @@ -135,10 +135,10 @@ VIDEO_UPDATE( alpha68k_II ) fillbitmap(bitmap,2047,cliprect); //AT - draw_sprites(machine, bitmap,cliprect,0,0x07c0,0x0800); - draw_sprites(machine, bitmap,cliprect,1,0x0000,0x0800); - draw_sprites(machine, bitmap,cliprect,2,0x0000,0x0800); - draw_sprites(machine, bitmap,cliprect,0,0x0000,0x07c0); + draw_sprites(screen->machine, bitmap,cliprect,0,0x07c0,0x0800); + draw_sprites(screen->machine, bitmap,cliprect,1,0x0000,0x0800); + draw_sprites(screen->machine, bitmap,cliprect,2,0x0000,0x0800); + draw_sprites(screen->machine, bitmap,cliprect,0,0x0000,0x07c0); //ZT tilemap_draw(bitmap,cliprect,fix_tilemap,0,0); return 0; @@ -277,22 +277,22 @@ VIDEO_UPDATE( alpha68k_V ) /* This appears to be correct priority */ if (alpha68k_microcontroller_id == 0x8814) /* Sky Adventure */ { - draw_sprites_V(machine, bitmap,cliprect,0,0x07c0,0x0800,0,0x8000,0x7fff); - draw_sprites_V(machine, bitmap,cliprect,1,0x0000,0x0800,0,0x8000,0x7fff); + draw_sprites_V(screen->machine, bitmap,cliprect,0,0x07c0,0x0800,0,0x8000,0x7fff); + draw_sprites_V(screen->machine, bitmap,cliprect,1,0x0000,0x0800,0,0x8000,0x7fff); //AT: *KLUDGE* fixes priest priority in level 1(could be a game bug) if (spriteram16[0x1bde]==0x24 && (spriteram16[0x1bdf]>>8)==0x3b) { - draw_sprites_V(machine, bitmap,cliprect,2,0x03c0,0x0800,0,0x8000,0x7fff); - draw_sprites_V(machine, bitmap,cliprect,2,0x0000,0x03c0,0,0x8000,0x7fff); + draw_sprites_V(screen->machine, bitmap,cliprect,2,0x03c0,0x0800,0,0x8000,0x7fff); + draw_sprites_V(screen->machine, bitmap,cliprect,2,0x0000,0x03c0,0,0x8000,0x7fff); } else - draw_sprites_V(machine, bitmap,cliprect,2,0x0000,0x0800,0,0x8000,0x7fff); - draw_sprites_V(machine, bitmap,cliprect,0,0x0000,0x07c0,0,0x8000,0x7fff); + draw_sprites_V(screen->machine, bitmap,cliprect,2,0x0000,0x0800,0,0x8000,0x7fff); + draw_sprites_V(screen->machine, bitmap,cliprect,0,0x0000,0x07c0,0,0x8000,0x7fff); } else /* gangwars */ { - draw_sprites_V(machine, bitmap,cliprect,0,0x07c0,0x0800,0x8000,0,0x7fff); - draw_sprites_V(machine, bitmap,cliprect,1,0x0000,0x0800,0x8000,0,0x7fff); - draw_sprites_V(machine, bitmap,cliprect,2,0x0000,0x0800,0x8000,0,0x7fff); - draw_sprites_V(machine, bitmap,cliprect,0,0x0000,0x07c0,0x8000,0,0x7fff); + draw_sprites_V(screen->machine, bitmap,cliprect,0,0x07c0,0x0800,0x8000,0,0x7fff); + draw_sprites_V(screen->machine, bitmap,cliprect,1,0x0000,0x0800,0x8000,0,0x7fff); + draw_sprites_V(screen->machine, bitmap,cliprect,2,0x0000,0x0800,0x8000,0,0x7fff); + draw_sprites_V(screen->machine, bitmap,cliprect,0,0x0000,0x07c0,0x8000,0,0x7fff); } tilemap_draw(bitmap,cliprect,fix_tilemap,0,0); @@ -311,10 +311,10 @@ VIDEO_UPDATE( alpha68k_V_sb ) fillbitmap(bitmap,4095,cliprect); /* This appears to be correct priority */ - draw_sprites_V(machine,bitmap,cliprect,0,0x07c0,0x0800,0x4000,0x8000,0x3fff); - draw_sprites_V(machine,bitmap,cliprect,1,0x0000,0x0800,0x4000,0x8000,0x3fff); - draw_sprites_V(machine,bitmap,cliprect,2,0x0000,0x0800,0x4000,0x8000,0x3fff); - draw_sprites_V(machine,bitmap,cliprect,0,0x0000,0x07c0,0x4000,0x8000,0x3fff); + draw_sprites_V(screen->machine,bitmap,cliprect,0,0x07c0,0x0800,0x4000,0x8000,0x3fff); + draw_sprites_V(screen->machine,bitmap,cliprect,1,0x0000,0x0800,0x4000,0x8000,0x3fff); + draw_sprites_V(screen->machine,bitmap,cliprect,2,0x0000,0x0800,0x4000,0x8000,0x3fff); + draw_sprites_V(screen->machine,bitmap,cliprect,0,0x0000,0x07c0,0x4000,0x8000,0x3fff); tilemap_draw(bitmap,cliprect,fix_tilemap,0,0); return 0; @@ -353,12 +353,12 @@ VIDEO_UPDATE( alpha68k_I ) { int yshift = (alpha68k_microcontroller_id == 0x890a) ? 1 : 0; // The Next Space is 1 pixel off - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); /* This appears to be correct priority */ - draw_sprites_I(machine, bitmap,cliprect,2,0x0800,yshift); - draw_sprites_I(machine, bitmap,cliprect,3,0x0c00,yshift); - draw_sprites_I(machine, bitmap,cliprect,1,0x0400,yshift); + draw_sprites_I(screen->machine, bitmap,cliprect,2,0x0800,yshift); + draw_sprites_I(screen->machine, bitmap,cliprect,3,0x0c00,yshift); + draw_sprites_I(screen->machine, bitmap,cliprect,1,0x0400,yshift); return 0; } //ZT @@ -479,12 +479,12 @@ static void kyros_draw_sprites(running_machine *machine, bitmap_t *bitmap, const VIDEO_UPDATE( kyros ) { - colortable_entry_set_value(machine->colortable, 0x100, *videoram16 & 0xff); + colortable_entry_set_value(screen->machine->colortable, 0x100, *videoram16 & 0xff); fillbitmap(bitmap, 0x100, cliprect); //AT - kyros_draw_sprites(machine, bitmap,cliprect,2,0x0800); - kyros_draw_sprites(machine, bitmap,cliprect,3,0x0c00); - kyros_draw_sprites(machine, bitmap,cliprect,1,0x0400); + kyros_draw_sprites(screen->machine, bitmap,cliprect,2,0x0800); + kyros_draw_sprites(screen->machine, bitmap,cliprect,3,0x0c00); + kyros_draw_sprites(screen->machine, bitmap,cliprect,1,0x0400); return 0; } @@ -537,11 +537,11 @@ static void sstingry_draw_sprites(running_machine *machine, bitmap_t *bitmap, co VIDEO_UPDATE( sstingry ) { - colortable_entry_set_value(machine->colortable, 0x100, *videoram16 & 0xff); + colortable_entry_set_value(screen->machine->colortable, 0x100, *videoram16 & 0xff); fillbitmap(bitmap, 0x100, cliprect); //AT - sstingry_draw_sprites(machine, bitmap,cliprect,2,0x0800); - sstingry_draw_sprites(machine, bitmap,cliprect,3,0x0c00); - sstingry_draw_sprites(machine, bitmap,cliprect,1,0x0400); + sstingry_draw_sprites(screen->machine, bitmap,cliprect,2,0x0800); + sstingry_draw_sprites(screen->machine, bitmap,cliprect,3,0x0c00); + sstingry_draw_sprites(screen->machine, bitmap,cliprect,1,0x0400); return 0; } diff --git a/src/mame/video/ambush.c b/src/mame/video/ambush.c index 512464062b1..f4058bc6fb9 100644 --- a/src/mame/video/ambush.c +++ b/src/mame/video/ambush.c @@ -99,7 +99,7 @@ VIDEO_UPDATE( ambush ) /* Draw the background priority characters */ - draw_chars(machine, bitmap, cliprect, 0x00); + draw_chars(screen->machine, bitmap, cliprect, 0x00); /* Draw the sprites. */ @@ -159,7 +159,7 @@ VIDEO_UPDATE( ambush ) flipy = !flipy; } - drawgfx(bitmap,machine->gfx[gfx], + drawgfx(bitmap,screen->machine->gfx[gfx], code, col | ((*ambush_colorbank & 0x03) << 4), flipx, flipy, sx,sy, @@ -168,6 +168,6 @@ VIDEO_UPDATE( ambush ) /* Draw the foreground priority characters */ - draw_chars(machine, bitmap, cliprect, 0x10); + draw_chars(screen->machine, bitmap, cliprect, 0x10); return 0; } diff --git a/src/mame/video/amiga.c b/src/mame/video/amiga.c index 75c79d18e82..5ade3035c96 100644 --- a/src/mame/video/amiga.c +++ b/src/mame/video/amiga.c @@ -984,7 +984,7 @@ VIDEO_UPDATE( amiga ) /* render each scanline in the visible region */ for (y = cliprect->min_y; y <= cliprect->max_y; y++) - amiga_render_scanline(machine, bitmap, y); + amiga_render_scanline(screen->machine, bitmap, y); return 0; } diff --git a/src/mame/video/amspdwy.c b/src/mame/video/amspdwy.c index eabd42c5459..addb1f858b7 100644 --- a/src/mame/video/amspdwy.c +++ b/src/mame/video/amspdwy.c @@ -145,6 +145,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( amspdwy ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/angelkds.c b/src/mame/video/angelkds.c index 9c5a3ae3569..9634ae50e03 100644 --- a/src/mame/video/angelkds.c +++ b/src/mame/video/angelkds.c @@ -285,19 +285,19 @@ VIDEO_UPDATE( angelkds ) /* draw top of screen */ clip.min_x = 8*0; clip.max_x = 8*16-1; - clip.min_y = machine->screen[0].visarea.min_y; - clip.max_y = machine->screen[0].visarea.max_y; + clip.min_y = screen->machine->screen[0].visarea.min_y; + clip.max_y = screen->machine->screen[0].visarea.max_y; if ((angelkds_layer_ctrl & 0x80) == 0x00) tilemap_draw(bitmap,&clip,bgtop_tilemap,0,0); - draw_sprites(machine, bitmap,&clip, 0x80); + draw_sprites(screen->machine, bitmap,&clip, 0x80); if ((angelkds_layer_ctrl & 0x20) == 0x00) tilemap_draw(bitmap,&clip,tx_tilemap,0,0); /* draw bottom of screen */ clip.min_x = 8*16; clip.max_x = 8*32-1; - clip.min_y = machine->screen[0].visarea.min_y; - clip.max_y = machine->screen[0].visarea.max_y; + clip.min_y = screen->machine->screen[0].visarea.min_y; + clip.max_y = screen->machine->screen[0].visarea.max_y; if ((angelkds_layer_ctrl & 0x40) == 0x00) tilemap_draw(bitmap,&clip,bgbot_tilemap,0,0); - draw_sprites(machine, bitmap,&clip, 0x40); + draw_sprites(screen->machine, bitmap,&clip, 0x40); if ((angelkds_layer_ctrl & 0x20) == 0x00) tilemap_draw(bitmap,&clip,tx_tilemap,0,0); return 0; } diff --git a/src/mame/video/appoooh.c b/src/mame/video/appoooh.c index 0b412c00758..c20da493e08 100644 --- a/src/mame/video/appoooh.c +++ b/src/mame/video/appoooh.c @@ -281,16 +281,16 @@ VIDEO_UPDATE( appoooh ) if (priority == 1) { /* sprite set #1 */ - appoooh_draw_sprites( bitmap, cliprect, machine->gfx[2],spriteram); + appoooh_draw_sprites( bitmap, cliprect, screen->machine->gfx[2],spriteram); /* sprite set #2 */ - appoooh_draw_sprites( bitmap, cliprect, machine->gfx[3],spriteram_2); + appoooh_draw_sprites( bitmap, cliprect, screen->machine->gfx[3],spriteram_2); } else { /* sprite set #2 */ - appoooh_draw_sprites( bitmap, cliprect, machine->gfx[3],spriteram_2); + appoooh_draw_sprites( bitmap, cliprect, screen->machine->gfx[3],spriteram_2); /* sprite set #1 */ - appoooh_draw_sprites( bitmap, cliprect, machine->gfx[2],spriteram); + appoooh_draw_sprites( bitmap, cliprect, screen->machine->gfx[2],spriteram); } if (priority != 0) /* fg in front of sprites */ @@ -309,16 +309,16 @@ VIDEO_UPDATE( robowres ) if (priority == 1) { /* sprite set #1 */ - robowres_draw_sprites( bitmap, cliprect, machine->gfx[2],spriteram); + robowres_draw_sprites( bitmap, cliprect, screen->machine->gfx[2],spriteram); /* sprite set #2 */ - robowres_draw_sprites( bitmap, cliprect, machine->gfx[3],spriteram_2); + robowres_draw_sprites( bitmap, cliprect, screen->machine->gfx[3],spriteram_2); } else { /* sprite set #2 */ - robowres_draw_sprites( bitmap, cliprect, machine->gfx[3],spriteram_2); + robowres_draw_sprites( bitmap, cliprect, screen->machine->gfx[3],spriteram_2); /* sprite set #1 */ - robowres_draw_sprites( bitmap, cliprect, machine->gfx[2],spriteram); + robowres_draw_sprites( bitmap, cliprect, screen->machine->gfx[2],spriteram); } if (priority != 0) /* fg in front of sprites */ diff --git a/src/mame/video/aquarium.c b/src/mame/video/aquarium.c index 3d2011578f3..5fbe4755584 100644 --- a/src/mame/video/aquarium.c +++ b/src/mame/video/aquarium.c @@ -173,7 +173,7 @@ VIDEO_UPDATE(aquarium) tilemap_draw(bitmap,cliprect,aquarium_bak_tilemap,0,0); tilemap_draw(bitmap,cliprect,aquarium_mid_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect,16); + draw_sprites(screen->machine, bitmap,cliprect,16); tilemap_draw(bitmap,cliprect,aquarium_bak_tilemap,1,0); tilemap_draw(bitmap,cliprect,aquarium_mid_tilemap,1,0); diff --git a/src/mame/video/arabian.c b/src/mame/video/arabian.c index c304069100d..079da38610d 100644 --- a/src/mame/video/arabian.c +++ b/src/mame/video/arabian.c @@ -373,7 +373,7 @@ WRITE8_HANDLER( arabian_videoram_w ) VIDEO_UPDATE( arabian ) { - const pen_t *pens = &machine->pens[(arabian_video_control >> 3) << 8]; + const pen_t *pens = &screen->machine->pens[(arabian_video_control >> 3) << 8]; int y; /* render the screen from the bitmap */ diff --git a/src/mame/video/arcadecl.c b/src/mame/video/arcadecl.c index 7a142970fc6..115ded873c4 100644 --- a/src/mame/video/arcadecl.c +++ b/src/mame/video/arcadecl.c @@ -89,7 +89,7 @@ VIDEO_START( arcadecl ) VIDEO_UPDATE( arcadecl ) { /* draw the playfield */ - rampart_bitmap_render(machine, bitmap, cliprect); + rampart_bitmap_render(screen->machine, bitmap, cliprect); /* draw and merge the MO */ if (has_mo) @@ -98,7 +98,7 @@ VIDEO_UPDATE( arcadecl ) bitmap_t *mobitmap; int x, y, r; - mobitmap = atarimo_render(machine, 0, cliprect, &rectlist); + mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) { diff --git a/src/mame/video/argus.c b/src/mame/video/argus.c index ac5778cbd03..6cfcab8b4e6 100644 --- a/src/mame/video/argus.c +++ b/src/mame/video/argus.c @@ -1532,24 +1532,22 @@ VIDEO_UPDATE( argus ) /* scroll BG0 and render tile at proper position */ argus_bg0_scroll_handle(); - fillbitmap(bitmap, machine->pens[0], cliprect); + fillbitmap(bitmap, screen->machine->pens[0], cliprect); tilemap_draw(bitmap, cliprect, bg0_tilemap, 0, 0); - argus_draw_sprites(machine, bitmap, cliprect, 0); + argus_draw_sprites(screen->machine, bitmap, cliprect, 0); tilemap_draw(bitmap, cliprect, bg1_tilemap, 0, 0); - argus_draw_sprites(machine, bitmap, cliprect, 1); + argus_draw_sprites(screen->machine, bitmap, cliprect, 1); tilemap_draw(bitmap, cliprect, tx_tilemap, 0, 0); return 0; } VIDEO_UPDATE( valtric ) { - fillbitmap(bitmap, machine->pens[0], cliprect); + fillbitmap(bitmap, screen->machine->pens[0], cliprect); if(valtric_mosaic==0) - { tilemap_draw(bitmap, cliprect, bg1_tilemap, 0, 0); - } else { tilemap_draw(mosaicbitmap, cliprect, bg1_tilemap, 0, 0); @@ -1558,27 +1556,22 @@ VIDEO_UPDATE( valtric ) UINT32 *dest; int x,y,xx,yy; if(valtric_mosaic<0)step*=-1; - for(y=0;y<machine->screen[0].width+step;y+=step) - for(x=0;x<machine->screen[0].height+step;x+=step) + for(y=0;y<screen->machine->screen[0].width+step;y+=step) + for(x=0;x<screen->machine->screen[0].height+step;x+=step) { static int c=0; - if(y<machine->screen[0].height && x< machine->screen[0].width) - { + if(y<screen->machine->screen[0].height && x< screen->machine->screen[0].width) c=*BITMAP_ADDR32(mosaicbitmap, y, x); - } if(valtric_mosaic<0) - { - if(y+step-1<machine->screen[0].height && x+step-1< machine->screen[0].width) - { + if(y+step-1<screen->machine->screen[0].height && x+step-1< screen->machine->screen[0].width) c = *BITMAP_ADDR32(mosaicbitmap, y+step-1, x+step-1); - } - } + for(yy=0;yy<step;yy++) for(xx=0;xx<step;xx++) { - if(xx+x < machine->screen[0].width && yy+y<machine->screen[0].height) + if(xx+x < screen->machine->screen[0].width && yy+y<screen->machine->screen[0].height) { dest=BITMAP_ADDR32(bitmap, y+yy, x+xx); *dest=c; @@ -1588,18 +1581,18 @@ VIDEO_UPDATE( valtric ) } } - valtric_draw_sprites(machine, bitmap, cliprect); + valtric_draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, tx_tilemap, 0, 0); return 0; } VIDEO_UPDATE( butasan ) { - fillbitmap(bitmap, machine->pens[0], cliprect); + fillbitmap(bitmap, screen->machine->pens[0], cliprect); tilemap_draw(bitmap, cliprect, bg1_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, bg0_tilemap, 0, 0); - butasan_draw_sprites(machine, bitmap, cliprect); + butasan_draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, tx_tilemap, 0, 0); #ifdef MAME_DEBUG @@ -1611,16 +1604,16 @@ VIDEO_UPDATE( butasan ) VIDEO_UPDATE( bombsa ) { - fillbitmap(bitmap, machine->pens[0], cliprect); + fillbitmap(bitmap, screen->machine->pens[0], cliprect); // tilemap_draw(bitmap, cliprect, bg1_tilemap, 0, 0); -// valtric_draw_sprites(bitmap, cliprect); +// valtric_draw_sprites(screen->bitmap, cliprect); tilemap_draw(bitmap, cliprect, bombsa_bg_tilemap, 0, 0); #if 0 tilemap_draw(bitmap, cliprect, tx_alt_tilemap, 0, 0); #endif tilemap_draw(bitmap, cliprect, tx_tilemap, 0, 0); - bombsa_draw_sprites(machine, bitmap,cliprect); + bombsa_draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/arkanoid.c b/src/mame/video/arkanoid.c index 13157369bd3..ad5e05b5703 100644 --- a/src/mame/video/arkanoid.c +++ b/src/mame/video/arkanoid.c @@ -123,6 +123,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( arkanoid ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c index 5d0adffa32b..071c5bd9930 100644 --- a/src/mame/video/armedf.c +++ b/src/mame/video/armedf.c @@ -334,17 +334,17 @@ VIDEO_UPDATE( armedf ) } else { - fillbitmap( bitmap, get_black_pen(machine)&0x0f, cliprect ); + fillbitmap( bitmap, get_black_pen(screen->machine)&0x0f, cliprect ); }*/ if ((mcu_mode&0x0030)==0x0030) tilemap_draw( bitmap, cliprect, armedf_tx_tilemap, 0, 0); - if( sprite_enable ) draw_sprites(machine, bitmap, cliprect, 2 ); + if( sprite_enable ) draw_sprites(screen->machine, bitmap, cliprect, 2 ); if ((mcu_mode&0x0030)==0x0020) tilemap_draw( bitmap, cliprect, armedf_tx_tilemap, 0, 0); tilemap_draw( bitmap, cliprect, fg_tilemap, 0, 0); if ((mcu_mode&0x0030)==0x0010) tilemap_draw( bitmap, cliprect, armedf_tx_tilemap, 0, 0); - if( sprite_enable ) draw_sprites(machine, bitmap, cliprect, 1 ); + if( sprite_enable ) draw_sprites(screen->machine, bitmap, cliprect, 1 ); if ((mcu_mode&0x0030)==0x0000) tilemap_draw( bitmap, cliprect, armedf_tx_tilemap, 0, 0); - if( sprite_enable ) draw_sprites(machine, bitmap, cliprect, 0 ); + if( sprite_enable ) draw_sprites(screen->machine, bitmap, cliprect, 0 ); return 0; } diff --git a/src/mame/video/asterix.c b/src/mame/video/asterix.c index afde73862ec..d7af9614e0d 100644 --- a/src/mame/video/asterix.c +++ b/src/mame/video/asterix.c @@ -119,13 +119,13 @@ VIDEO_UPDATE( asterix ) fillbitmap(priority_bitmap, 0, cliprect); fillbitmap(bitmap, 0, cliprect); - K056832_tilemap_draw(machine, bitmap, cliprect, layer[0], 0, 1); - K056832_tilemap_draw(machine, bitmap, cliprect, layer[1], 0, 2); - K056832_tilemap_draw(machine, bitmap, cliprect, layer[2], 0, 4); + K056832_tilemap_draw(screen->machine, bitmap, cliprect, layer[0], 0, 1); + K056832_tilemap_draw(screen->machine, bitmap, cliprect, layer[1], 0, 2); + K056832_tilemap_draw(screen->machine, bitmap, cliprect, layer[2], 0, 4); pdrawgfx_shadow_lowpri = 1; /* fix shadows in front of feet */ K053245_sprites_draw(0, bitmap, cliprect); - K056832_tilemap_draw(machine, bitmap, cliprect, 2, 0, 0); + K056832_tilemap_draw(screen->machine, bitmap, cliprect, 2, 0, 0); return 0; } diff --git a/src/mame/video/astrocde.c b/src/mame/video/astrocde.c index 592cb0ab526..c44c894fbff 100644 --- a/src/mame/video/astrocde.c +++ b/src/mame/video/astrocde.c @@ -309,7 +309,7 @@ VIDEO_UPDATE( astrocde ) /* compute the starting point of sparkle for the current frame */ if (astrocade_video_config & AC_STARS) - sparklebase = (video_screen_get_frame_number(0) * (UINT64)(machine->screen[0].width * machine->screen[0].height)) % RNG_PERIOD; + sparklebase = (video_screen_get_frame_number(0) * (UINT64)(screen->machine->screen[0].width * screen->machine->screen[0].height)) % RNG_PERIOD; /* iterate over scanlines */ for (y = cliprect->min_y; y <= cliprect->max_y; y++) @@ -323,8 +323,8 @@ VIDEO_UPDATE( astrocde ) /* compute the star and sparkle offset at the start of this line */ if (astrocade_video_config & AC_STARS) { - staroffs = ((effy < 0) ? (effy + 262) : effy) * machine->screen[0].width; - sparkleoffs = sparklebase + y * machine->screen[0].width; + staroffs = ((effy < 0) ? (effy + 262) : effy) * screen->machine->screen[0].width; + sparkleoffs = sparklebase + y * screen->machine->screen[0].width; if (sparkleoffs >= RNG_PERIOD) sparkleoffs -= RNG_PERIOD; } diff --git a/src/mame/video/asuka.c b/src/mame/video/asuka.c index cbd5fdae5c0..27e01dcde7e 100644 --- a/src/mame/video/asuka.c +++ b/src/mame/video/asuka.c @@ -47,7 +47,7 @@ VIDEO_UPDATE( asuka ) { UINT8 layer[3]; - TC0100SCN_tilemap_update(machine); + TC0100SCN_tilemap_update(screen->machine); layer[0] = TC0100SCN_bottomlayer(0); layer[1] = layer[0]^1; @@ -58,12 +58,12 @@ VIDEO_UPDATE( asuka ) /* Ensure screen blanked even when bottom layer not drawn due to disable bit */ fillbitmap(bitmap, 0, cliprect); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,1); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[1],0,2); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[2],0,4); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,1); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[1],0,2); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[2],0,4); /* Sprites may be over or under top bg layer */ - PC090OJ_draw_sprites(machine,bitmap,cliprect,2); + PC090OJ_draw_sprites(screen->machine,bitmap,cliprect,2); return 0; } @@ -72,7 +72,7 @@ VIDEO_UPDATE( bonzeadv ) { UINT8 layer[3]; - TC0100SCN_tilemap_update(machine); + TC0100SCN_tilemap_update(screen->machine); layer[0] = TC0100SCN_bottomlayer(0); layer[1] = layer[0]^1; @@ -83,11 +83,11 @@ VIDEO_UPDATE( bonzeadv ) /* Ensure screen blanked even when bottom layer not drawn due to disable bit */ fillbitmap(bitmap, 0, cliprect); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,1); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[1],0,2); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[2],0,4); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,1); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[1],0,2); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[2],0,4); /* Sprites are always over both bg layers */ - PC090OJ_draw_sprites(machine,bitmap,cliprect,0); + PC090OJ_draw_sprites(screen->machine,bitmap,cliprect,0); return 0; } diff --git a/src/mame/video/atarifb.c b/src/mame/video/atarifb.c index 8cb91325cbf..7125b19c555 100644 --- a/src/mame/video/atarifb.c +++ b/src/mame/video/atarifb.c @@ -186,9 +186,9 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( atarifb ) { - draw_playfield_and_alpha(machine, bitmap, cliprect, 0, 0); + draw_playfield_and_alpha(screen->machine, bitmap, cliprect, 0, 0); - draw_sprites(machine, bitmap, cliprect, 1, 0); + draw_sprites(screen->machine, bitmap, cliprect, 1, 0); return 0; } @@ -196,9 +196,9 @@ VIDEO_UPDATE( atarifb ) VIDEO_UPDATE( abaseb ) { - draw_playfield_and_alpha(machine, bitmap, cliprect, -8, 0); + draw_playfield_and_alpha(screen->machine, bitmap, cliprect, -8, 0); - draw_sprites(machine, bitmap, cliprect, 1, 0); + draw_sprites(screen->machine, bitmap, cliprect, 1, 0); return 0; } @@ -206,9 +206,9 @@ VIDEO_UPDATE( abaseb ) VIDEO_UPDATE( soccer ) { - draw_playfield_and_alpha(machine, bitmap, cliprect, 0, 8); + draw_playfield_and_alpha(screen->machine, bitmap, cliprect, 0, 8); - draw_sprites(machine, bitmap, cliprect, 2, 1); + draw_sprites(screen->machine, bitmap, cliprect, 2, 1); return 0; } diff --git a/src/mame/video/atarisy1.c b/src/mame/video/atarisy1.c index 848115cc959..3ce515e2dd5 100644 --- a/src/mame/video/atarisy1.c +++ b/src/mame/video/atarisy1.c @@ -522,7 +522,7 @@ VIDEO_UPDATE( atarisy1 ) tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); /* draw and merge the MO */ - mobitmap = atarimo_render(machine, 0, cliprect, &rectlist); + mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) { diff --git a/src/mame/video/atarisy2.c b/src/mame/video/atarisy2.c index 9576ab790ac..6f90aff664c 100644 --- a/src/mame/video/atarisy2.c +++ b/src/mame/video/atarisy2.c @@ -342,7 +342,7 @@ VIDEO_UPDATE( atarisy2 ) tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 3, 3); /* draw and merge the MO */ - mobitmap = atarimo_render(machine, 0, cliprect, &rectlist); + mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) { diff --git a/src/mame/video/badlands.c b/src/mame/video/badlands.c index 0c081190b7a..f2faac50797 100644 --- a/src/mame/video/badlands.c +++ b/src/mame/video/badlands.c @@ -125,7 +125,7 @@ VIDEO_UPDATE( badlands ) tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); /* draw and merge the MO */ - mobitmap = atarimo_render(machine, 0, cliprect, &rectlist); + mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) { diff --git a/src/mame/video/bagman.c b/src/mame/video/bagman.c index ea4ca52893f..5dfc0793085 100644 --- a/src/mame/video/bagman.c +++ b/src/mame/video/bagman.c @@ -148,6 +148,6 @@ VIDEO_UPDATE( bagman ) return 0; tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/balsente.c b/src/mame/video/balsente.c index 56209b5a244..f37fb202ea4 100644 --- a/src/mame/video/balsente.c +++ b/src/mame/video/balsente.c @@ -223,18 +223,16 @@ static void draw_one_sprite(running_machine *machine, bitmap_t *bitmap, const re VIDEO_UPDATE( balsente ) { - const pen_t *pens = &machine->pens[palettebank_vis * 256]; + const pen_t *pens = &screen->machine->pens[palettebank_vis * 256]; int y, i; /* draw scanlines from the VRAM directly */ for (y = cliprect->min_y; y <= cliprect->max_y; y++) - { draw_scanline8(bitmap, 0, y, 256, &local_videoram[(y - BALSENTE_VBEND) * 256], pens, -1); - } /* draw the sprite images */ for (i = 0; i < 40; i++) - draw_one_sprite(machine, bitmap, cliprect, &spriteram[(0xe0 + i * 4) & 0xff]); + draw_one_sprite(screen->machine, bitmap, cliprect, &spriteram[(0xe0 + i * 4) & 0xff]); return 0; } diff --git a/src/mame/video/baraduke.c b/src/mame/video/baraduke.c index bf1e43cbaeb..1bd53693ea4 100644 --- a/src/mame/video/baraduke.c +++ b/src/mame/video/baraduke.c @@ -324,9 +324,9 @@ VIDEO_UPDATE( baraduke ) back = 0; tilemap_draw(bitmap,cliprect,bg_tilemap[back],TILEMAP_DRAW_OPAQUE,0); - draw_sprites(machine, bitmap,cliprect,0); + draw_sprites(screen->machine, bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,bg_tilemap[back ^ 1],0,0); - draw_sprites(machine, bitmap,cliprect,1); + draw_sprites(screen->machine, bitmap,cliprect,1); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; diff --git a/src/mame/video/batman.c b/src/mame/video/batman.c index c2cb6795f59..355a71a4ac9 100644 --- a/src/mame/video/batman.c +++ b/src/mame/video/batman.c @@ -211,7 +211,7 @@ VIDEO_UPDATE( batman ) tilemap_draw(bitmap, cliprect, atarigen_playfield2_tilemap, 3, 0x8c); /* draw and merge the MO */ - mobitmap = atarimo_render(machine, 0, cliprect, &rectlist); + mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) { diff --git a/src/mame/video/battlane.c b/src/mame/video/battlane.c index 83cc6cc8c27..c94ce7a4b3a 100644 --- a/src/mame/video/battlane.c +++ b/src/mame/video/battlane.c @@ -241,7 +241,7 @@ VIDEO_UPDATE( battlane ) tilemap_mark_all_tiles_dirty(bg_tilemap); // HACK tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); - draw_fg_bitmap(machine, bitmap); + draw_sprites(screen->machine, bitmap, cliprect); + draw_fg_bitmap(screen->machine, bitmap); return 0; } diff --git a/src/mame/video/battlera.c b/src/mame/video/battlera.c index 384f884a763..bfdf4d98b32 100644 --- a/src/mame/video/battlera.c +++ b/src/mame/video/battlera.c @@ -307,19 +307,21 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan } -static void screenrefresh(running_machine *machine, bitmap_t *bitmap,const rectangle *clip) +/******************************************************************************/ + +VIDEO_UPDATE( battlera ) { int offs,code,scrollx,scrolly,mx,my; /* Dynamically decode chars if dirty */ for (code = 0x0000;code < 0x1000;code++) if (tile_dirty[code]) - decodechar(machine->gfx[0],code,HuC6270_vram); + decodechar(screen->machine->gfx[0],code,HuC6270_vram); /* Dynamically decode sprites if dirty */ for (code = 0x0000;code < 0x400;code++) if (sprite_dirty[code]) - decodechar(machine->gfx[1],code,HuC6270_vram); + decodechar(screen->machine->gfx[1],code,HuC6270_vram); /* NB: If first 0x1000 byte is always tilemap, no need to decode the first batch of tiles/sprites */ @@ -334,19 +336,19 @@ static void screenrefresh(running_machine *machine, bitmap_t *bitmap,const recta /* If this tile was changed OR tilemap was changed, redraw */ if (tile_dirty[code] || vram_dirty[offs/2]) { vram_dirty[offs/2]=0; - drawgfx(tile_bitmap,machine->gfx[0], + drawgfx(tile_bitmap,screen->machine->gfx[0], code, HuC6270_vram[offs] >> 4, 0,0, 8*mx,8*my, 0,TRANSPARENCY_NONE,0); - drawgfx(front_bitmap,machine->gfx[2], + drawgfx(front_bitmap,screen->machine->gfx[2], 0, 0, /* fill the spot with pen 256 */ 0,0, 8*mx,8*my, 0,TRANSPARENCY_NONE,0); - drawgfx(front_bitmap,machine->gfx[0], + drawgfx(front_bitmap,screen->machine->gfx[0], code, HuC6270_vram[offs] >> 4, 0,0, @@ -363,27 +365,21 @@ static void screenrefresh(running_machine *machine, bitmap_t *bitmap,const recta /* Render bitmap */ scrollx=-HuC6270_registers[7]; - scrolly=-HuC6270_registers[8]+clip->min_y-1; + scrolly=-HuC6270_registers[8]+cliprect->min_y-1; - copyscrollbitmap(bitmap,tile_bitmap,1,&scrollx,1,&scrolly,clip); + copyscrollbitmap(bitmap,tile_bitmap,1,&scrollx,1,&scrolly,cliprect); /* Todo: Background enable (not used anyway) */ /* Render low priority sprites, if enabled */ - if (sb_enable) draw_sprites(machine,bitmap,clip,0); + if (sb_enable) draw_sprites(screen->machine,bitmap,cliprect,0); /* Render background over sprites */ - copyscrollbitmap_trans(bitmap,front_bitmap,1,&scrollx,1,&scrolly,clip,256); + copyscrollbitmap_trans(bitmap,front_bitmap,1,&scrollx,1,&scrolly,cliprect,256); /* Render high priority sprites, if enabled */ - if (sb_enable) draw_sprites(machine,bitmap,clip,1); -} + if (sb_enable) draw_sprites(screen->machine,bitmap,cliprect,1); -/******************************************************************************/ - -VIDEO_UPDATE( battlera ) -{ - screenrefresh(machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/battlex.c b/src/mame/video/battlex.c index ede04e50a0d..c4a5491a7ed 100644 --- a/src/mame/video/battlex.c +++ b/src/mame/video/battlex.c @@ -116,6 +116,6 @@ VIDEO_UPDATE(battlex) { tilemap_set_scrollx(bg_tilemap, 0, battlex_scroll_lsb | (battlex_scroll_msb << 8)); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/bbusters.c b/src/mame/video/bbusters.c index 3771975ea01..a32067867ef 100644 --- a/src/mame/video/bbusters.c +++ b/src/mame/video/bbusters.c @@ -276,10 +276,10 @@ VIDEO_UPDATE( bbuster ) tilemap_set_scrolly( pf2_tilemap,0, bbuster_pf2_scroll_data[1] ); tilemap_draw(bitmap,cliprect,pf2_tilemap,0,0); -// draw_sprites(machine,bitmap,buffered_spriteram16_2,2,0x8,0x8); +// draw_sprites(screen->machine,bitmap,buffered_spriteram16_2,2,0x8,0x8); tilemap_draw(bitmap,cliprect,pf1_tilemap,0,0); - draw_sprites(machine,bitmap,buffered_spriteram16_2,2,0,0); - draw_sprites(machine,bitmap,buffered_spriteram16,1,0,0); + draw_sprites(screen->machine,bitmap,buffered_spriteram16_2,2,0,0); + draw_sprites(screen->machine,bitmap,buffered_spriteram16,1,0,0); tilemap_draw(bitmap,cliprect,fix_tilemap,0,0); return 0; } @@ -293,7 +293,7 @@ VIDEO_UPDATE( mechatt ) tilemap_draw(bitmap,cliprect,pf2_tilemap,0,0); tilemap_draw(bitmap,cliprect,pf1_tilemap,0,0); - draw_sprites(machine,bitmap,buffered_spriteram16,1,0,0); + draw_sprites(screen->machine,bitmap,buffered_spriteram16,1,0,0); tilemap_draw(bitmap,cliprect,fix_tilemap,0,0); return 0; } diff --git a/src/mame/video/beezer.c b/src/mame/video/beezer.c index f2772a0cf53..6bb9f4c52d3 100644 --- a/src/mame/video/beezer.c +++ b/src/mame/video/beezer.c @@ -19,8 +19,8 @@ VIDEO_UPDATE( beezer ) { int x,y; - for (y = machine->screen[0].visarea.min_y; y <= machine->screen[0].visarea.max_y; y+=2) - for (x = machine->screen[0].visarea.min_x; x <= machine->screen[0].visarea.max_x; x++) + for (y = cliprect->min_y; y <= cliprect->max_y; y+=2) + for (x = cliprect->min_x; x <= cliprect->max_x; x++) { *BITMAP_ADDR16(bitmap, y+1, x) = videoram[0x80*y+x] & 0x0f; *BITMAP_ADDR16(bitmap, y, x) = videoram[0x80*y+x] >> 4; diff --git a/src/mame/video/bigevglf.c b/src/mame/video/bigevglf.c index a58ea1ed550..c7837e20d46 100644 --- a/src/mame/video/bigevglf.c +++ b/src/mame/video/bigevglf.c @@ -91,6 +91,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( bigevglf ) { copybitmap(bitmap,tmp_bitmap[ plane_visible ],0,0,0,0,cliprect); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/bigstrkb.c b/src/mame/video/bigstrkb.c index 79d38646f4f..b764cb196d7 100644 --- a/src/mame/video/bigstrkb.c +++ b/src/mame/video/bigstrkb.c @@ -126,7 +126,7 @@ VIDEO_START(bigstrkb) VIDEO_UPDATE(bigstrkb) { -// fillbitmap(bitmap,get_black_pen(machine),cliprect); +// fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); tilemap_set_scrollx(bsb_tilemap2,0, bsb_vidreg1[0]+(256-14)); tilemap_set_scrolly(bsb_tilemap2,0, bsb_vidreg2[0]); @@ -137,7 +137,7 @@ VIDEO_UPDATE(bigstrkb) tilemap_draw(bitmap,cliprect,bsb_tilemap2,0,0); tilemap_draw(bitmap,cliprect,bsb_tilemap3,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,bsb_tilemap,0,0); // popmessage ("Regs %08x %08x %08x %08x",bsb_vidreg2[0],bsb_vidreg2[1],bsb_vidreg2[2],bsb_vidreg2[3]); diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c index b0c716fa36c..ed728b0f33e 100644 --- a/src/mame/video/bionicc.c +++ b/src/mame/video/bionicc.c @@ -223,7 +223,7 @@ VIDEO_UPDATE( bionicc ) tilemap_draw(bitmap,cliprect,fg_tilemap,1|TILEMAP_DRAW_LAYER1,0); /* nothing in FRONT */ tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,0|TILEMAP_DRAW_LAYER1,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,fg_tilemap,0|TILEMAP_DRAW_LAYER0,0); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; diff --git a/src/mame/video/bishi.c b/src/mame/video/bishi.c index 6895ec1b352..4b7bd47b816 100644 --- a/src/mame/video/bishi.c +++ b/src/mame/video/bishi.c @@ -72,8 +72,8 @@ VIDEO_UPDATE(bishi) static const int pris[4] = { K55_PRIINP_0, K55_PRIINP_3, K55_PRIINP_6, K55_PRIINP_7 }; static const int enables[4] = { K55_INP_VRAM_A, K55_INP_VRAM_B, K55_INP_VRAM_C, K55_INP_VRAM_D }; - K054338_update_all_shadows(machine); - K054338_fill_backcolor(machine, bitmap, 0); + K054338_update_all_shadows(screen->machine); + K054338_fill_backcolor(screen->machine, bitmap, 0); for (i = 0; i < 4; i++) { @@ -89,7 +89,7 @@ VIDEO_UPDATE(bishi) { if (K055555_read_register(K55_INPUT_ENABLES) & enables[layers[i]]) { - K056832_tilemap_draw(machine, bitmap, cliprect, layers[i], 0, 1<<i); + K056832_tilemap_draw(screen->machine, bitmap, cliprect, layers[i], 0, 1<<i); } } return 0; diff --git a/src/mame/video/bking.c b/src/mame/video/bking.c index c39aa6557ed..c1237da3683 100644 --- a/src/mame/video/bking.c +++ b/src/mame/video/bking.c @@ -258,14 +258,14 @@ VIDEO_UPDATE( bking ) /* draw the balls */ - drawgfx(bitmap, machine->gfx[2], + drawgfx(bitmap, screen->machine->gfx[2], ball1_pic, palette_bank, 0, 0, xld1, yld1, cliprect, TRANSPARENCY_PEN, 0); - drawgfx(bitmap, machine->gfx[3], + drawgfx(bitmap, screen->machine->gfx[3], ball2_pic, palette_bank, 0, 0, @@ -274,7 +274,7 @@ VIDEO_UPDATE( bking ) /* draw the crow */ - drawgfx(bitmap, machine->gfx[1], + drawgfx(bitmap, screen->machine->gfx[1], crow_pic, palette_bank, crow_flip, crow_flip, diff --git a/src/mame/video/bladestl.c b/src/mame/video/bladestl.c index d2d2e88727c..c68fe23fe74 100644 --- a/src/mame/video/bladestl.c +++ b/src/mame/video/bladestl.c @@ -90,7 +90,7 @@ VIDEO_START( bladestl ) VIDEO_UPDATE( bladestl ) { - set_pens(machine->colortable); + set_pens(screen->machine->colortable); K007342_tilemap_update(); diff --git a/src/mame/video/blktiger.c b/src/mame/video/blktiger.c index a3e81d613c7..6ba15e07668 100644 --- a/src/mame/video/blktiger.c +++ b/src/mame/video/blktiger.c @@ -233,7 +233,7 @@ VIDEO_UPDATE( blktiger ) tilemap_draw(bitmap,cliprect,screen_layout ? bg_tilemap8x4 : bg_tilemap4x8,TILEMAP_DRAW_LAYER1,0); if (objon) - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); if (bgon) tilemap_draw(bitmap,cliprect,screen_layout ? bg_tilemap8x4 : bg_tilemap4x8,TILEMAP_DRAW_LAYER0,0); diff --git a/src/mame/video/blmbycar.c b/src/mame/video/blmbycar.c index aa96276cf66..ee14a07990e 100644 --- a/src/mame/video/blmbycar.c +++ b/src/mame/video/blmbycar.c @@ -256,6 +256,6 @@ if (input_code_pressed(KEYCODE_Z)) tilemap_draw(bitmap, cliprect, tilemap_1, i, i); if (layers_ctrl&8) - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/bloodbro.c b/src/mame/video/bloodbro.c index 2975bac88a3..c212117e5dd 100644 --- a/src/mame/video/bloodbro.c +++ b/src/mame/video/bloodbro.c @@ -237,7 +237,7 @@ VIDEO_UPDATE( bloodbro ) tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,0,1); - bloodbro_draw_sprites(machine,bitmap,cliprect); + bloodbro_draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; } @@ -253,7 +253,7 @@ VIDEO_UPDATE( weststry ) tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,0,1); - weststry_draw_sprites(machine,bitmap,cliprect); + weststry_draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; } @@ -270,7 +270,7 @@ VIDEO_UPDATE( skysmash ) tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,0,1); - bloodbro_draw_sprites(machine,bitmap,cliprect); + bloodbro_draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; } diff --git a/src/mame/video/blstroid.c b/src/mame/video/blstroid.c index d9d34d174b1..a95b75b0844 100644 --- a/src/mame/video/blstroid.c +++ b/src/mame/video/blstroid.c @@ -155,7 +155,7 @@ VIDEO_UPDATE( blstroid ) tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); /* draw and merge the MO */ - mobitmap = atarimo_render(machine, 0, cliprect, &rectlist); + mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) { diff --git a/src/mame/video/blueprnt.c b/src/mame/video/blueprnt.c index cf3df8dc692..b89238443c2 100644 --- a/src/mame/video/blueprnt.c +++ b/src/mame/video/blueprnt.c @@ -122,9 +122,9 @@ VIDEO_UPDATE( blueprnt ) for (i = 0; i < 32; i++) tilemap_set_scrolly(bg_tilemap, i, blueprnt_scrollram[30 - i]); - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine,bitmap, cliprect); + draw_sprites(screen->machine,bitmap, cliprect); tilemap_draw(bitmap, cliprect, bg_tilemap, 1, 0); return 0; } diff --git a/src/mame/video/bogeyman.c b/src/mame/video/bogeyman.c index f5671a1b58a..9035146bba5 100644 --- a/src/mame/video/bogeyman.c +++ b/src/mame/video/bogeyman.c @@ -149,7 +149,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( bogeyman ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/bombjack.c b/src/mame/video/bombjack.c index 2aa7746d8d8..12346ccce0e 100644 --- a/src/mame/video/bombjack.c +++ b/src/mame/video/bombjack.c @@ -135,6 +135,6 @@ VIDEO_UPDATE( bombjack ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/boogwing.c b/src/mame/video/boogwing.c index 7c0c56bb74d..53711b39e2a 100644 --- a/src/mame/video/boogwing.c +++ b/src/mame/video/boogwing.c @@ -163,7 +163,7 @@ VIDEO_UPDATE(boogwing) /* Draw playfields */ deco16_clear_sprite_priority_bitmap(); - fillbitmap(bitmap,machine->pens[0x400],cliprect); /* pen not confirmed */ + fillbitmap(bitmap,screen->machine->pens[0x400],cliprect); /* pen not confirmed */ fillbitmap(priority_bitmap,0,NULL); // bit&0x8 is definitely some kind of palette effect @@ -195,8 +195,8 @@ VIDEO_UPDATE(boogwing) deco16_tilemap_2_draw(bitmap,cliprect,0,32); } - draw_sprites(machine, bitmap, cliprect, buffered_spriteram16, 3); - draw_sprites(machine, bitmap, cliprect, buffered_spriteram16_2, 4); + draw_sprites(screen->machine, bitmap, cliprect, buffered_spriteram16, 3); + draw_sprites(screen->machine, bitmap, cliprect, buffered_spriteram16_2, 4); deco16_tilemap_1_draw(bitmap,cliprect,0,0); return 0; diff --git a/src/mame/video/bosco.c b/src/mame/video/bosco.c index c9123522d4e..69924d6c262 100644 --- a/src/mame/video/bosco.c +++ b/src/mame/video/bosco.c @@ -308,19 +308,19 @@ VIDEO_UPDATE( bosco ) fg_clip.min_x = 28*8; } - fillbitmap(bitmap,get_black_pen(machine),cliprect); - draw_stars(machine, bitmap,cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); + draw_stars(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,&bg_clip,bg_tilemap,0,0); tilemap_draw(bitmap,&fg_clip,fg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); /* draw the high priority characters */ tilemap_draw(bitmap,&bg_clip,bg_tilemap,1,0); tilemap_draw(bitmap,&fg_clip,fg_tilemap,1,0); - draw_bullets(machine, bitmap,cliprect); + draw_bullets(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/boxer.c b/src/mame/video/boxer.c index 2bedf996816..f5c631ec26a 100644 --- a/src/mame/video/boxer.c +++ b/src/mame/video/boxer.c @@ -73,7 +73,7 @@ VIDEO_UPDATE( boxer ) { UINT8 code = boxer_tile_ram[32 * i + j]; - drawgfx(bitmap, machine->gfx[2], + drawgfx(bitmap, screen->machine->gfx[2], code, 0, code & 0x40, code & 0x40, @@ -84,6 +84,6 @@ VIDEO_UPDATE( boxer ) } } - draw_boxer(machine, bitmap, cliprect); + draw_boxer(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/brkthru.c b/src/mame/video/brkthru.c index ca0b140b9ef..f3461a1027e 100644 --- a/src/mame/video/brkthru.c +++ b/src/mame/video/brkthru.c @@ -266,13 +266,13 @@ VIDEO_UPDATE( brkthru ) tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_OPAQUE,0); /* low priority sprites */ - draw_sprites(machine, bitmap, cliprect, 0x01 ); + draw_sprites(screen->machine, bitmap, cliprect, 0x01 ); /* draw background over low priority sprites */ tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); /* high priority sprites */ - draw_sprites(machine, bitmap, cliprect, 0x09 ); + draw_sprites(screen->machine, bitmap, cliprect, 0x09 ); /* fg layer */ tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); diff --git a/src/mame/video/bsktball.c b/src/mame/video/bsktball.c index 0b8e65dd3ef..d1952c3845f 100644 --- a/src/mame/video/bsktball.c +++ b/src/mame/video/bsktball.c @@ -58,6 +58,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( bsktball ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/btime.c b/src/mame/video/btime.c index d85fdf8b8b8..74cc496e4d3 100644 --- a/src/mame/video/btime.c +++ b/src/mame/video/btime.c @@ -496,16 +496,13 @@ VIDEO_UPDATE( btime ) start = (start + 1) & 0x03; } - draw_background(machine, bitmap, cliprect, btime_tilemap, 0); - - draw_chars(machine, bitmap, cliprect, TRANSPARENCY_PEN, 0, -1); + draw_background(screen->machine, bitmap, cliprect, btime_tilemap, 0); + draw_chars(screen->machine, bitmap, cliprect, TRANSPARENCY_PEN, 0, -1); } else - { - draw_chars(machine, bitmap, cliprect, TRANSPARENCY_NONE, 0, -1); - } + draw_chars(screen->machine, bitmap, cliprect, TRANSPARENCY_NONE, 0, -1); - draw_sprites(machine, bitmap, cliprect, 0, 1, 0, btime_videoram, 0x20); + draw_sprites(screen->machine, bitmap, cliprect, 0, 1, 0, btime_videoram, 0x20); return 0; } @@ -513,9 +510,8 @@ VIDEO_UPDATE( btime ) VIDEO_UPDATE( eggs ) { - draw_chars(machine, bitmap, cliprect, TRANSPARENCY_NONE, 0, -1); - - draw_sprites(machine, bitmap, cliprect, 0, 0, 0, btime_videoram, 0x20); + draw_chars(screen->machine, bitmap, cliprect, TRANSPARENCY_NONE, 0, -1); + draw_sprites(screen->machine, bitmap, cliprect, 0, 0, 0, btime_videoram, 0x20); return 0; } @@ -523,9 +519,8 @@ VIDEO_UPDATE( eggs ) VIDEO_UPDATE( lnc ) { - draw_chars(machine, bitmap, cliprect, TRANSPARENCY_NONE, 0, -1); - - draw_sprites(machine, bitmap, cliprect, 0, 1, 2, btime_videoram, 0x20); + draw_chars(screen->machine, bitmap, cliprect, TRANSPARENCY_NONE, 0, -1); + draw_sprites(screen->machine, bitmap, cliprect, 0, 1, 2, btime_videoram, 0x20); return 0; } @@ -535,18 +530,15 @@ VIDEO_UPDATE( zoar ) { if (bnj_scroll1 & 0x04) { - draw_background(machine, bitmap, cliprect, zoar_scrollram, btime_palette); - - draw_chars(machine, bitmap, cliprect, TRANSPARENCY_PEN, btime_palette + 1, -1); + draw_background(screen->machine, bitmap, cliprect, zoar_scrollram, btime_palette); + draw_chars(screen->machine, bitmap, cliprect, TRANSPARENCY_PEN, btime_palette + 1, -1); } else - { - draw_chars(machine, bitmap, cliprect, TRANSPARENCY_NONE, btime_palette + 1, -1); - } + draw_chars(screen->machine, bitmap, cliprect, TRANSPARENCY_NONE, btime_palette + 1, -1); /* The order is important for correct priorities */ - draw_sprites(machine, bitmap, cliprect, btime_palette + 1, 1, 2, btime_videoram + 0x1f, 0x20); - draw_sprites(machine, bitmap, cliprect, btime_palette + 1, 1, 2, btime_videoram, 0x20); + draw_sprites(screen->machine, bitmap, cliprect, btime_palette + 1, 1, 2, btime_videoram + 0x1f, 0x20); + draw_sprites(screen->machine, bitmap, cliprect, btime_palette + 1, 1, 2, btime_videoram, 0x20); return 0; } @@ -572,7 +564,7 @@ VIDEO_UPDATE( bnj ) sy = 240 - sy; } - drawgfx(background_bitmap, machine->gfx[2], + drawgfx(background_bitmap, screen->machine->gfx[2], (bnj_backgroundram[offs] >> 4) + ((offs & 0x80) >> 3) + 32, 0, flip_screen_get(), flip_screen_get(), @@ -584,20 +576,20 @@ VIDEO_UPDATE( bnj ) scroll = (bnj_scroll1 & 0x02) * 128 + 511 - bnj_scroll2; if (!flip_screen_get()) scroll = 767-scroll; - copyscrollbitmap (bitmap, background_bitmap, 1, &scroll, 0, 0, cliprect); + copyscrollbitmap(bitmap, background_bitmap, 1, &scroll, 0, 0, cliprect); /* copy the low priority characters followed by the sprites then the high priority characters */ - draw_chars(machine, bitmap, cliprect, TRANSPARENCY_PEN, 0, 1); - draw_sprites(machine, bitmap, cliprect, 0, 0, 0, btime_videoram, 0x20); - draw_chars(machine, bitmap, cliprect, TRANSPARENCY_PEN, 0, 0); + draw_chars(screen->machine, bitmap, cliprect, TRANSPARENCY_PEN, 0, 1); + draw_sprites(screen->machine, bitmap, cliprect, 0, 0, 0, btime_videoram, 0x20); + draw_chars(screen->machine, bitmap, cliprect, TRANSPARENCY_PEN, 0, 0); } else { - draw_chars(machine, bitmap, cliprect, TRANSPARENCY_NONE, 0, -1); - - draw_sprites(machine, bitmap, cliprect, 0, 0, 0, btime_videoram, 0x20); + draw_chars(screen->machine, bitmap, cliprect, TRANSPARENCY_NONE, 0, -1); + draw_sprites(screen->machine, bitmap, cliprect, 0, 0, 0, btime_videoram, 0x20); } + return 0; } @@ -619,7 +611,7 @@ VIDEO_UPDATE( cookrace ) sy = 31 - sy; } - drawgfx(bitmap, machine->gfx[2], + drawgfx(bitmap, screen->machine->gfx[2], bnj_backgroundram[offs], 0, flip_screen_get(), flip_screen_get(), @@ -627,9 +619,8 @@ VIDEO_UPDATE( cookrace ) cliprect, TRANSPARENCY_NONE, 0); } - draw_chars(machine, bitmap, cliprect, TRANSPARENCY_PEN, 0, -1); - - draw_sprites(machine, bitmap, cliprect, 0, 1, 0, btime_videoram, 0x20); + draw_chars(screen->machine, bitmap, cliprect, TRANSPARENCY_PEN, 0, -1); + draw_sprites(screen->machine, bitmap, cliprect, 0, 1, 0, btime_videoram, 0x20); return 0; } @@ -637,11 +628,9 @@ VIDEO_UPDATE( cookrace ) VIDEO_UPDATE( disco ) { - decode_modified(machine, spriteram, 1); - - draw_chars(machine, bitmap, cliprect, TRANSPARENCY_NONE, btime_palette, -1); - - draw_sprites(machine, bitmap, cliprect, btime_palette, 0, 0, spriteram, 1); + decode_modified(screen->machine, spriteram, 1); + draw_chars(screen->machine, bitmap, cliprect, TRANSPARENCY_NONE, btime_palette, -1); + draw_sprites(screen->machine, bitmap, cliprect, btime_palette, 0, 0, spriteram, 1); return 0; } @@ -649,11 +638,9 @@ VIDEO_UPDATE( disco ) VIDEO_UPDATE( progolf ) { - decode_modified(machine, spriteram, 1); - - draw_chars(machine, bitmap, cliprect, TRANSPARENCY_NONE, /*btime_palette*/0, -1); - -// draw_sprites(machine, bitmap, cliprect, 0/*btime_palette*/, 0, 0, spriteram, 1); + decode_modified(screen->machine, spriteram, 1); + draw_chars(screen->machine, bitmap, cliprect, TRANSPARENCY_NONE, /*btime_palette*/0, -1); +// draw_sprites(screen->machine, bitmap, cliprect, 0/*btime_palette*/, 0, 0, spriteram, 1); return 0; } diff --git a/src/mame/video/bublbobl.c b/src/mame/video/bublbobl.c index b140936a9fe..ca471936ff9 100644 --- a/src/mame/video/bublbobl.c +++ b/src/mame/video/bublbobl.c @@ -83,7 +83,7 @@ VIDEO_UPDATE( bublbobl ) flipy = !flipy; } - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], code, color, flipx,flipy, diff --git a/src/mame/video/buggychl.c b/src/mame/video/buggychl.c index d60c0728709..7e654a28e2f 100644 --- a/src/mame/video/buggychl.c +++ b/src/mame/video/buggychl.c @@ -247,14 +247,14 @@ VIDEO_UPDATE( buggychl ) /* decode modified characters */ for (code = 0;code < 256;code++) if (dirtychar[code]) - decodechar(machine->gfx[0],code,buggychl_character_ram); + decodechar(screen->machine->gfx[0],code,buggychl_character_ram); if (bg_on) - draw_bg(machine, bitmap, cliprect); + draw_bg(screen->machine, bitmap, cliprect); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); - draw_fg(machine, bitmap, cliprect); + draw_fg(screen->machine, bitmap, cliprect); for (code = 0;code < 256;code++) dirtychar[code] = 0; diff --git a/src/mame/video/bwing.c b/src/mame/video/bwing.c index 57e97c2b72d..5cc67ac0e57 100644 --- a/src/mame/video/bwing.c +++ b/src/mame/video/bwing.c @@ -274,10 +274,10 @@ VIDEO_UPDATE( bwing ) tilemap_draw(bitmap, cliprect, bgmap, 0, 0); } else - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); // draw low priority sprites - draw_sprites(machine, bitmap, cliprect, buffered_spriteram, 0); + draw_sprites(screen->machine, bitmap, cliprect, buffered_spriteram, 0); // draw foreground if (!(mapmask & 2)) @@ -291,7 +291,7 @@ VIDEO_UPDATE( bwing ) } // draw high priority sprites - draw_sprites(machine, bitmap, cliprect, buffered_spriteram, 1); + draw_sprites(screen->machine, bitmap, cliprect, buffered_spriteram, 1); // draw text layer // if (mapmask & 4) diff --git a/src/mame/video/cabal.c b/src/mame/video/cabal.c index 6aea5ec8860..023845cf9a2 100644 --- a/src/mame/video/cabal.c +++ b/src/mame/video/cabal.c @@ -141,7 +141,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( cabal ) { tilemap_draw(bitmap,cliprect,background_layer,TILEMAP_DRAW_OPAQUE,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,text_layer,0,0); return 0; } diff --git a/src/mame/video/canyon.c b/src/mame/video/canyon.c index 411a8594bc4..446d0648c31 100644 --- a/src/mame/video/canyon.c +++ b/src/mame/video/canyon.c @@ -86,12 +86,12 @@ VIDEO_UPDATE( canyon ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); draw_bombs(bitmap, cliprect); /* watchdog is disabled during service mode */ - watchdog_enable(machine, !(readinputport(2) & 0x10)); + watchdog_enable(screen->machine, !(readinputport(2) & 0x10)); return 0; } diff --git a/src/mame/video/capbowl.c b/src/mame/video/capbowl.c index 766f4b3b2ce..d832e4100b6 100644 --- a/src/mame/video/capbowl.c +++ b/src/mame/video/capbowl.c @@ -175,7 +175,7 @@ VIDEO_UPDATE( capbowl ) /* if we're blanked, just fill with black */ if (state.blanked) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); return 0; } diff --git a/src/mame/video/carjmbre.c b/src/mame/video/carjmbre.c index 63c856a7dd7..c99d961ca47 100644 --- a/src/mame/video/carjmbre.c +++ b/src/mame/video/carjmbre.c @@ -134,7 +134,7 @@ VIDEO_UPDATE( carjmbre ) flipy = !flipy; } - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], spriteram[troffs+1], spriteram[troffs+2]&0x07, flipx,flipy, diff --git a/src/mame/video/carpolo.c b/src/mame/video/carpolo.c index c9d6cfdba7a..7131f4f93d4 100644 --- a/src/mame/video/carpolo.c +++ b/src/mame/video/carpolo.c @@ -243,7 +243,7 @@ VIDEO_UPDATE( carpolo ) plot_box(bitmap,0,TOP_BORDER,RIGHT_BORDER+1,BOTTOM_BORDER-TOP_BORDER+1,FIELD_PEN); /* car 1 */ - draw_sprite(machine, bitmap, cliprect, + draw_sprite(screen->machine, bitmap, cliprect, carpolo_spriteram[0x00], carpolo_spriteram[0x01], 0, carpolo_spriteram[0x0c] & 0x0f, CAR1_COLOR); @@ -254,28 +254,28 @@ VIDEO_UPDATE( carpolo ) plot_box(bitmap,RIGHT_BORDER,TOP_BORDER,1,BOTTOM_BORDER-TOP_BORDER+1,LINE_PEN); /* car 4 */ - draw_sprite(machine, bitmap, cliprect, + draw_sprite(screen->machine, bitmap, cliprect, carpolo_spriteram[0x06], carpolo_spriteram[0x07], 0, carpolo_spriteram[0x0d] >> 4, CAR4_COLOR); /* car 3 */ - draw_sprite(machine, bitmap, cliprect, + draw_sprite(screen->machine, bitmap, cliprect, carpolo_spriteram[0x04], carpolo_spriteram[0x05], 0, carpolo_spriteram[0x0d] & 0x0f, CAR3_COLOR); /* car 2 */ - draw_sprite(machine, bitmap, cliprect, + draw_sprite(screen->machine, bitmap, cliprect, carpolo_spriteram[0x02], carpolo_spriteram[0x03], 0, carpolo_spriteram[0x0c] >> 4, CAR2_COLOR); /* ball */ - draw_sprite(machine, bitmap, cliprect, + draw_sprite(screen->machine, bitmap, cliprect, carpolo_spriteram[0x08], carpolo_spriteram[0x09], 1, carpolo_spriteram[0x0e] & 0x0f, BALL_COLOR); /* left goal - position determined by bit 6 of the horizontal and vertical timing PROMs */ - drawgfxzoom(bitmap,machine->gfx[1], + drawgfxzoom(bitmap,screen->machine->gfx[1], 0,0, 0,0, LEFT_GOAL_X,GOAL_Y, @@ -283,7 +283,7 @@ VIDEO_UPDATE( carpolo ) 0x20000,0x20000); /* right goal */ - drawgfxzoom(bitmap,machine->gfx[1], + drawgfxzoom(bitmap,screen->machine->gfx[1], 0,1, 1,0, RIGHT_GOAL_X,GOAL_Y, @@ -296,7 +296,7 @@ VIDEO_UPDATE( carpolo ) popmessage("WIDE!\n"); if (carpolo_spriteram[0x0f] & 0x01) - draw_sprite(machine, bitmap, cliprect, + draw_sprite(screen->machine, bitmap, cliprect, carpolo_spriteram[0x0a], carpolo_spriteram[0x0b], 1, carpolo_spriteram[0x0e] >> 4, SPECIAL_CHAR_COLOR); @@ -307,14 +307,14 @@ VIDEO_UPDATE( carpolo ) and bit 3 of the vertical timing PROM controls in which quadrant the line will actually appear */ - draw_alpha_line(machine, bitmap, cliprect, 0, (0*4+0)*2 ); - draw_alpha_line(machine, bitmap, cliprect, 1, (0*4+0)*2+1); - draw_alpha_line(machine, bitmap, cliprect, 2, (3*4+1)*2 ); - draw_alpha_line(machine, bitmap, cliprect, 3, (3*4+1)*2+1); - draw_alpha_line(machine, bitmap, cliprect, 4, (1*4+2)*2 ); - draw_alpha_line(machine, bitmap, cliprect, 5, (1*4+2)*2+1); - draw_alpha_line(machine, bitmap, cliprect, 6, (0*4+3)*2 ); - draw_alpha_line(machine, bitmap, cliprect, 7, (0*4+3)*2+1); + draw_alpha_line(screen->machine, bitmap, cliprect, 0, (0*4+0)*2 ); + draw_alpha_line(screen->machine, bitmap, cliprect, 1, (0*4+0)*2+1); + draw_alpha_line(screen->machine, bitmap, cliprect, 2, (3*4+1)*2 ); + draw_alpha_line(screen->machine, bitmap, cliprect, 3, (3*4+1)*2+1); + draw_alpha_line(screen->machine, bitmap, cliprect, 4, (1*4+2)*2 ); + draw_alpha_line(screen->machine, bitmap, cliprect, 5, (1*4+2)*2+1); + draw_alpha_line(screen->machine, bitmap, cliprect, 6, (0*4+3)*2 ); + draw_alpha_line(screen->machine, bitmap, cliprect, 7, (0*4+3)*2+1); return 0; } diff --git a/src/mame/video/cave.c b/src/mame/video/cave.c index c657e4387e5..4f938565733 100644 --- a/src/mame/video/cave.c +++ b/src/mame/video/cave.c @@ -1439,7 +1439,7 @@ VIDEO_UPDATE( cave ) int pri, pri2; int layers_ctrl = -1; - set_pens(machine); + set_pens(screen->machine); blit.baseaddr = bitmap->base; blit.line_offset = bitmap->rowpixels * bitmap->bpp / 8; @@ -1523,7 +1523,7 @@ VIDEO_UPDATE( cave ) } #endif - cave_sprite_check(machine, cliprect); + cave_sprite_check(screen->machine, cliprect); fillbitmap(bitmap,background_color,cliprect); diff --git a/src/mame/video/cbasebal.c b/src/mame/video/cbasebal.c index 2806755a129..fd513b1096c 100644 --- a/src/mame/video/cbasebal.c +++ b/src/mame/video/cbasebal.c @@ -179,7 +179,7 @@ VIDEO_UPDATE( cbasebal ) fillbitmap(bitmap,768,cliprect); if (obj_on) - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); if (text_on) tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); diff --git a/src/mame/video/cbuster.c b/src/mame/video/cbuster.c index 5f79df0e946..b9f571d47e4 100644 --- a/src/mame/video/cbuster.c +++ b/src/mame/video/cbuster.c @@ -145,7 +145,7 @@ VIDEO_UPDATE( twocrude ) /* Draw playfields & sprites */ deco16_tilemap_4_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE,0); - draw_sprites(machine,bitmap,cliprect,0); + draw_sprites(screen->machine,bitmap,cliprect,0); if (twocrude_pri) { deco16_tilemap_2_draw(bitmap,cliprect,0,0); @@ -156,7 +156,7 @@ VIDEO_UPDATE( twocrude ) deco16_tilemap_2_draw(bitmap,cliprect,0,0); } - draw_sprites(machine,bitmap,cliprect,1); + draw_sprites(screen->machine,bitmap,cliprect,1); deco16_tilemap_1_draw(bitmap,cliprect,0,0); return 0; } diff --git a/src/mame/video/ccastles.c b/src/mame/video/ccastles.c index ae0a29e71a7..0473b8b3ba2 100644 --- a/src/mame/video/ccastles.c +++ b/src/mame/video/ccastles.c @@ -277,7 +277,7 @@ VIDEO_UPDATE( ccastles ) { UINT8 *spriteaddr = &spriteram[video_control[7] * 0x100]; /* BUF1/BUF2 */ int flip = video_control[4] ? 0xff : 0x00; /* PLAYER2 */ - pen_t black = get_black_pen(machine); + pen_t black = get_black_pen(screen->machine); int x, y, offs; /* draw the sprites */ @@ -289,7 +289,7 @@ VIDEO_UPDATE( ccastles ) int which = spriteaddr[offs]; int color = spriteaddr[offs+2] >> 7; - drawgfx(spritebitmap, machine->gfx[0], which, color, flip, flip, x, y, cliprect, TRANSPARENCY_PEN, 7); + drawgfx(spritebitmap, screen->machine->gfx[0], which, color, flip, flip, x, y, cliprect, TRANSPARENCY_PEN, 7); } /* draw the bitmap to the screen, looping over Y */ diff --git a/src/mame/video/cclimber.c b/src/mame/video/cclimber.c index 486862a3d3b..9f376bda4b6 100644 --- a/src/mame/video/cclimber.c +++ b/src/mame/video/cclimber.c @@ -633,13 +633,13 @@ VIDEO_UPDATE( cclimber ) if ((cclimber_bigsprite_control[0] & 0x01)) { cclimber_draw_bigsprite(bitmap, cliprect); - cclimber_draw_sprites(bitmap, machine->gfx, cliprect); + cclimber_draw_sprites(bitmap, screen->machine->gfx, cliprect); } /* draw the "big sprite" over the regular sprites */ else { - cclimber_draw_sprites(bitmap, machine->gfx, cliprect); + cclimber_draw_sprites(bitmap, screen->machine->gfx, cliprect); cclimber_draw_bigsprite(bitmap, cliprect); } @@ -667,13 +667,13 @@ VIDEO_UPDATE( yamato ) if ((cclimber_bigsprite_control[0] & 0x01)) { cclimber_draw_bigsprite(bitmap, cliprect); - cclimber_draw_sprites(bitmap, machine->gfx, cliprect); + cclimber_draw_sprites(bitmap, screen->machine->gfx, cliprect); } /* draw the "big sprite" over the regular sprites */ else { - cclimber_draw_sprites(bitmap, machine->gfx, cliprect); + cclimber_draw_sprites(bitmap, screen->machine->gfx, cliprect); cclimber_draw_bigsprite(bitmap, cliprect); } @@ -683,7 +683,7 @@ VIDEO_UPDATE( yamato ) VIDEO_UPDATE( swimmer ) { - swimmer_set_background_pen(machine); + swimmer_set_background_pen(screen->machine); if (*swimmer_side_background_enabled & 0x01) { @@ -719,13 +719,13 @@ VIDEO_UPDATE( swimmer ) if ((cclimber_bigsprite_control[0] & 0x01)) { cclimber_draw_bigsprite(bitmap, cliprect); - swimmer_draw_sprites(bitmap, machine->gfx, cliprect); + swimmer_draw_sprites(bitmap, screen->machine->gfx, cliprect); } /* draw the "big sprite" over the regular sprites */ else { - swimmer_draw_sprites(bitmap, machine->gfx, cliprect); + swimmer_draw_sprites(bitmap, screen->machine->gfx, cliprect); cclimber_draw_bigsprite(bitmap, cliprect); } @@ -750,7 +750,7 @@ VIDEO_UPDATE( toprollr ) /* draw the "big sprite" over the regular sprites */ if ((cclimber_bigsprite_control[1] & 0x20)) { - cclimber_draw_sprites(bitmap, machine->gfx, &scroll_area_clip); + cclimber_draw_sprites(bitmap, screen->machine->gfx, &scroll_area_clip); toprollr_draw_bigsprite(bitmap, &scroll_area_clip); } @@ -758,7 +758,7 @@ VIDEO_UPDATE( toprollr ) else { toprollr_draw_bigsprite(bitmap, &scroll_area_clip); - cclimber_draw_sprites(bitmap, machine->gfx, &scroll_area_clip); + cclimber_draw_sprites(bitmap, screen->machine->gfx, &scroll_area_clip); } tilemap_mark_all_tiles_dirty(pf_tilemap); diff --git a/src/mame/video/centiped.c b/src/mame/video/centiped.c index 9025d3269e1..f41ee0b1b1c 100644 --- a/src/mame/video/centiped.c +++ b/src/mame/video/centiped.c @@ -434,7 +434,7 @@ VIDEO_UPDATE( centiped ) int x = spriteram[offs + 0x20]; int y = 240 - spriteram[offs + 0x10]; - drawgfx(bitmap, machine->gfx[1], code, color, flipx, flipy, x, y, + drawgfx(bitmap, screen->machine->gfx[1], code, color, flipx, flipy, x, y, &spriteclip, TRANSPARENCY_PENS, penmask[color & 0x3f]); } return 0; @@ -443,7 +443,7 @@ VIDEO_UPDATE( centiped ) VIDEO_UPDATE( warlords ) { - int upright_mode = input_port_0_r(machine, 0) & 0x80; + int upright_mode = readinputport(0) & 0x80; int offs; /* if the cocktail/upright switch flipped, force refresh */ @@ -479,7 +479,7 @@ VIDEO_UPDATE( warlords ) flipx = !flipx; } - drawgfx(bitmap, machine->gfx[1], code, color, flipx, flipy, x, y, + drawgfx(bitmap, screen->machine->gfx[1], code, color, flipx, flipy, x, y, cliprect, TRANSPARENCY_PEN, 0); } return 0; @@ -510,7 +510,7 @@ VIDEO_UPDATE( bullsdrt ) int x = spriteram[offs + 0x20]; int y = 240 - spriteram[offs + 0x10]; - drawgfx(bitmap, machine->gfx[1], code, color & 0x3f, 1, flipy, x, y, + drawgfx(bitmap, screen->machine->gfx[1], code, color & 0x3f, 1, flipy, x, y, &spriteclip, TRANSPARENCY_PEN, 0); } return 0; @@ -547,7 +547,7 @@ VIDEO_UPDATE( milliped ) flipy = !flipy; } - drawgfx(bitmap, machine->gfx[1], code, color, flipx, flipy, x, y, + drawgfx(bitmap, screen->machine->gfx[1], code, color, flipx, flipy, x, y, &spriteclip, TRANSPARENCY_PENS, penmask[color & 0x3f]); } return 0; diff --git a/src/mame/video/chaknpop.c b/src/mame/video/chaknpop.c index 73b782e1f88..61481e8f1ce 100644 --- a/src/mame/video/chaknpop.c +++ b/src/mame/video/chaknpop.c @@ -280,7 +280,7 @@ static void draw_bitmap(bitmap_t *bitmap, const rectangle *cliprect) VIDEO_UPDATE( chaknpop ) { tilemap_draw(bitmap, cliprect, tx_tilemap, 0, 0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); draw_bitmap(bitmap,cliprect); return 0; } diff --git a/src/mame/video/champbas.c b/src/mame/video/champbas.c index 62656e21e50..b7f7100111c 100644 --- a/src/mame/video/champbas.c +++ b/src/mame/video/champbas.c @@ -164,6 +164,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( champbas ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/cheekyms.c b/src/mame/video/cheekyms.c index 1451c81dbe0..20673f5e404 100644 --- a/src/mame/video/cheekyms.c +++ b/src/mame/video/cheekyms.c @@ -168,7 +168,7 @@ VIDEO_UPDATE( cheekyms ) fillbitmap(bitmap, 0, cliprect); /* sprites go under the playfield */ - draw_sprites(machine->gfx, bitmap, cliprect, flip); + draw_sprites(screen->machine->gfx, bitmap, cliprect, flip); /* draw the non-scrolling parts of the playfield first */ tilemap_set_scrolly(cheekyms_tilemap, 0, 0); diff --git a/src/mame/video/circus.c b/src/mame/video/circus.c index 36f0fdaf411..432e02d4d9f 100644 --- a/src/mame/video/circus.c +++ b/src/mame/video/circus.c @@ -118,7 +118,7 @@ static void circus_draw_fg(running_machine *machine, bitmap_t *bitmap, const rec VIDEO_UPDATE( circus ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - circus_draw_fg(machine, bitmap, cliprect); + circus_draw_fg(screen->machine, bitmap, cliprect); return 0; } @@ -170,7 +170,7 @@ VIDEO_UPDATE( robotbwl ) tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); robotbwl_draw_scoreboard(bitmap, cliprect); robotbwl_draw_bowling_alley(bitmap, cliprect); - robotbwl_draw_ball(machine, bitmap, cliprect); + robotbwl_draw_ball(screen->machine, bitmap, cliprect); return 0; } @@ -187,7 +187,7 @@ static void crash_draw_car(running_machine *machine, bitmap_t *bitmap, const rec VIDEO_UPDATE( crash ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - crash_draw_car(machine, bitmap, cliprect); + crash_draw_car(screen->machine, bitmap, cliprect); return 0; } @@ -256,6 +256,6 @@ static void ripcord_draw_skydiver(running_machine *machine, bitmap_t *bitmap, co VIDEO_UPDATE( ripcord ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - ripcord_draw_skydiver(machine, bitmap, cliprect); + ripcord_draw_skydiver(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/circusc.c b/src/mame/video/circusc.c index 39a75f0f769..3215f9bf423 100644 --- a/src/mame/video/circusc.c +++ b/src/mame/video/circusc.c @@ -214,7 +214,7 @@ VIDEO_UPDATE( circusc ) fillbitmap(bitmap, 0, cliprect); tilemap_draw(bitmap,cliprect,bg_tilemap,1,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); return 0; } diff --git a/src/mame/video/cischeat.c b/src/mame/video/cischeat.c index e72d248a46f..676045b4546 100644 --- a/src/mame/video/cischeat.c +++ b/src/mame/video/cischeat.c @@ -1178,8 +1178,8 @@ VIDEO_UPDATE( bigrun ) for (i = 7; i >= 4; i--) { /* bitmap, road, min_priority, max_priority, transparency */ - if (megasys1_active_layers & 0x10) cischeat_draw_road(machine,bitmap,cliprect,0,i,i,TRANSPARENCY_NONE); - if (megasys1_active_layers & 0x20) cischeat_draw_road(machine,bitmap,cliprect,1,i,i,TRANSPARENCY_PEN); + if (megasys1_active_layers & 0x10) cischeat_draw_road(screen->machine,bitmap,cliprect,0,i,i,TRANSPARENCY_NONE); + if (megasys1_active_layers & 0x20) cischeat_draw_road(screen->machine,bitmap,cliprect,1,i,i,TRANSPARENCY_PEN); } flag = 0; @@ -1188,11 +1188,11 @@ VIDEO_UPDATE( bigrun ) for (i = 3; i >= 0; i--) { /* bitmap, road, min_priority, max_priority, transparency */ - if (megasys1_active_layers & 0x10) cischeat_draw_road(machine,bitmap,cliprect,0,i,i,TRANSPARENCY_PEN); - if (megasys1_active_layers & 0x20) cischeat_draw_road(machine,bitmap,cliprect,1,i,i,TRANSPARENCY_PEN); + if (megasys1_active_layers & 0x10) cischeat_draw_road(screen->machine,bitmap,cliprect,0,i,i,TRANSPARENCY_PEN); + if (megasys1_active_layers & 0x20) cischeat_draw_road(screen->machine,bitmap,cliprect,1,i,i,TRANSPARENCY_PEN); } - if (megasys1_active_layers & 0x08) bigrun_draw_sprites(machine,bitmap,cliprect,15,0); + if (megasys1_active_layers & 0x08) bigrun_draw_sprites(screen->machine,bitmap,cliprect,15,0); cischeat_tmap_DRAW(2) @@ -1230,25 +1230,25 @@ VIDEO_UPDATE( cischeat ) fillbitmap(bitmap,0,cliprect); /* bitmap, road, priority, transparency */ - if (megasys1_active_layers & 0x10) cischeat_draw_road(machine,bitmap,cliprect,0,7,5,TRANSPARENCY_NONE); - if (megasys1_active_layers & 0x20) cischeat_draw_road(machine,bitmap,cliprect,1,7,5,TRANSPARENCY_PEN); + if (megasys1_active_layers & 0x10) cischeat_draw_road(screen->machine,bitmap,cliprect,0,7,5,TRANSPARENCY_NONE); + if (megasys1_active_layers & 0x20) cischeat_draw_road(screen->machine,bitmap,cliprect,1,7,5,TRANSPARENCY_PEN); flag = 0; cischeat_tmap_DRAW(0) // else fillbitmap(bitmap,0,cliprect); cischeat_tmap_DRAW(1) - if (megasys1_active_layers & 0x08) cischeat_draw_sprites(machine,bitmap,cliprect,15,3); - if (megasys1_active_layers & 0x10) cischeat_draw_road(machine,bitmap,cliprect,0,4,1,TRANSPARENCY_PEN); - if (megasys1_active_layers & 0x20) cischeat_draw_road(machine,bitmap,cliprect,1,4,1,TRANSPARENCY_PEN); - if (megasys1_active_layers & 0x08) cischeat_draw_sprites(machine,bitmap,cliprect,2,2); - if (megasys1_active_layers & 0x10) cischeat_draw_road(machine,bitmap,cliprect,0,0,0,TRANSPARENCY_PEN); - if (megasys1_active_layers & 0x20) cischeat_draw_road(machine,bitmap,cliprect,1,0,0,TRANSPARENCY_PEN); - if (megasys1_active_layers & 0x08) cischeat_draw_sprites(machine,bitmap,cliprect,1,0); + if (megasys1_active_layers & 0x08) cischeat_draw_sprites(screen->machine,bitmap,cliprect,15,3); + if (megasys1_active_layers & 0x10) cischeat_draw_road(screen->machine,bitmap,cliprect,0,4,1,TRANSPARENCY_PEN); + if (megasys1_active_layers & 0x20) cischeat_draw_road(screen->machine,bitmap,cliprect,1,4,1,TRANSPARENCY_PEN); + if (megasys1_active_layers & 0x08) cischeat_draw_sprites(screen->machine,bitmap,cliprect,2,2); + if (megasys1_active_layers & 0x10) cischeat_draw_road(screen->machine,bitmap,cliprect,0,0,0,TRANSPARENCY_PEN); + if (megasys1_active_layers & 0x20) cischeat_draw_road(screen->machine,bitmap,cliprect,1,0,0,TRANSPARENCY_PEN); + if (megasys1_active_layers & 0x08) cischeat_draw_sprites(screen->machine,bitmap,cliprect,1,0); cischeat_tmap_DRAW(2) /* for the map screen */ - if (megasys1_active_layers & 0x08) cischeat_draw_sprites(machine,bitmap,cliprect,0+16,0+16); + if (megasys1_active_layers & 0x08) cischeat_draw_sprites(screen->machine,bitmap,cliprect,0+16,0+16); megasys1_active_layers = megasys1_active_layers1; @@ -1288,8 +1288,8 @@ VIDEO_UPDATE( f1gpstar ) /* 1: clouds 5, grad 7, road 0 2: clouds 5, grad 7, road 0, tunnel roof 0 */ /* road 1!! 0!! */ /* bitmap, road, min_priority, max_priority, transparency */ - if (megasys1_active_layers & 0x20) f1gpstar_draw_road(machine,bitmap,cliprect,1,6,7,TRANSPARENCY_PEN); - if (megasys1_active_layers & 0x10) f1gpstar_draw_road(machine,bitmap,cliprect,0,6,7,TRANSPARENCY_PEN); + if (megasys1_active_layers & 0x20) f1gpstar_draw_road(screen->machine,bitmap,cliprect,1,6,7,TRANSPARENCY_PEN); + if (megasys1_active_layers & 0x10) f1gpstar_draw_road(screen->machine,bitmap,cliprect,0,6,7,TRANSPARENCY_PEN); flag = 0; cischeat_tmap_DRAW(0) @@ -1297,18 +1297,18 @@ VIDEO_UPDATE( f1gpstar ) cischeat_tmap_DRAW(1) /* road 1!! 0!! */ /* bitmap, road, min_priority, max_priority, transparency */ - if (megasys1_active_layers & 0x20) f1gpstar_draw_road(machine,bitmap,cliprect,1,1,5,TRANSPARENCY_PEN); - if (megasys1_active_layers & 0x10) f1gpstar_draw_road(machine,bitmap,cliprect,0,1,5,TRANSPARENCY_PEN); + if (megasys1_active_layers & 0x20) f1gpstar_draw_road(screen->machine,bitmap,cliprect,1,1,5,TRANSPARENCY_PEN); + if (megasys1_active_layers & 0x10) f1gpstar_draw_road(screen->machine,bitmap,cliprect,0,1,5,TRANSPARENCY_PEN); - if (megasys1_active_layers & 0x08) cischeat_draw_sprites(machine,bitmap,cliprect,15,2); + if (megasys1_active_layers & 0x08) cischeat_draw_sprites(screen->machine,bitmap,cliprect,15,2); /* road 1!! 0!! */ /* bitmap, road, min_priority, max_priority, transparency */ - if (megasys1_active_layers & 0x20) f1gpstar_draw_road(machine,bitmap,cliprect,1,0,0,TRANSPARENCY_PEN); - if (megasys1_active_layers & 0x10) f1gpstar_draw_road(machine,bitmap,cliprect,0,0,0,TRANSPARENCY_PEN); + if (megasys1_active_layers & 0x20) f1gpstar_draw_road(screen->machine,bitmap,cliprect,1,0,0,TRANSPARENCY_PEN); + if (megasys1_active_layers & 0x10) f1gpstar_draw_road(screen->machine,bitmap,cliprect,0,0,0,TRANSPARENCY_PEN); - if (megasys1_active_layers & 0x08) cischeat_draw_sprites(machine,bitmap,cliprect,1,1); + if (megasys1_active_layers & 0x08) cischeat_draw_sprites(screen->machine,bitmap,cliprect,1,1); cischeat_tmap_DRAW(2) - if (megasys1_active_layers & 0x08) cischeat_draw_sprites(machine,bitmap,cliprect,0,0); + if (megasys1_active_layers & 0x08) cischeat_draw_sprites(screen->machine,bitmap,cliprect,0,0); megasys1_active_layers = megasys1_active_layers1; @@ -1350,9 +1350,9 @@ if ( input_code_pressed(KEYCODE_Z) || input_code_pressed(KEYCODE_X) ) #if 1 popmessage("Cmd: %04X Pos:%04X Lim:%04X Inp:%04X", scudhamm_motor_command, - scudhamm_motor_pos_r(machine,0,0), - scudhamm_motor_status_r(machine,0,0), - scudhamm_analog_r(machine,0,0) ); + scudhamm_motor_pos_r(screen->machine,0,0), + scudhamm_motor_status_r(screen->machine,0,0), + scudhamm_analog_r(screen->machine,0,0) ); #endif } @@ -1368,7 +1368,7 @@ if ( input_code_pressed(KEYCODE_Z) || input_code_pressed(KEYCODE_X) ) cischeat_tmap_DRAW(0) // else fillbitmap(bitmap,0,cliprect); // cischeat_tmap_DRAW(1) - if (megasys1_active_layers & 0x08) cischeat_draw_sprites(machine,bitmap,cliprect,0,15); + if (megasys1_active_layers & 0x08) cischeat_draw_sprites(screen->machine,bitmap,cliprect,0,15); cischeat_tmap_DRAW(2) megasys1_active_layers = megasys1_active_layers1; diff --git a/src/mame/video/citycon.c b/src/mame/video/citycon.c index 687482681d5..2aaba4f7f29 100644 --- a/src/mame/video/citycon.c +++ b/src/mame/video/citycon.c @@ -166,6 +166,6 @@ VIDEO_UPDATE( citycon ) tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/cloak.c b/src/mame/video/cloak.c index e99571bc665..d2281493d49 100644 --- a/src/mame/video/cloak.c +++ b/src/mame/video/cloak.c @@ -224,9 +224,9 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( cloak ) { - set_pens(machine); + set_pens(screen->machine); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); draw_bitmap(bitmap, cliprect); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/cloud9.c b/src/mame/video/cloud9.c index 618f1dff913..b8c8d320fd0 100644 --- a/src/mame/video/cloud9.c +++ b/src/mame/video/cloud9.c @@ -257,7 +257,7 @@ VIDEO_UPDATE( cloud9 ) { UINT8 *spriteaddr = spriteram; int flip = video_control[5] ? 0xff : 0x00; /* PLAYER2 */ - pen_t black = get_black_pen(machine); + pen_t black = get_black_pen(screen->machine); int x, y, offs; /* draw the sprites */ @@ -272,9 +272,9 @@ VIDEO_UPDATE( cloud9 ) int which = spriteaddr[offs + 0x20]; int color = 0; - drawgfx(spritebitmap, machine->gfx[0], which, color, xflip, yflip, x, y, cliprect, TRANSPARENCY_PEN, 0); + drawgfx(spritebitmap, screen->machine->gfx[0], which, color, xflip, yflip, x, y, cliprect, TRANSPARENCY_PEN, 0); if (x >= 256 - 16) - drawgfx(spritebitmap, machine->gfx[0], which, color, xflip, yflip, x - 256, y, cliprect, TRANSPARENCY_PEN, 0); + drawgfx(spritebitmap, screen->machine->gfx[0], which, color, xflip, yflip, x - 256, y, cliprect, TRANSPARENCY_PEN, 0); } /* draw the bitmap to the screen, looping over Y */ diff --git a/src/mame/video/clshroad.c b/src/mame/video/clshroad.c index 73db6b573cc..47a49c8bf17 100644 --- a/src/mame/video/clshroad.c +++ b/src/mame/video/clshroad.c @@ -341,7 +341,7 @@ VIDEO_UPDATE( clshroad ) tilemap_draw(bitmap,cliprect,tilemap_0a,0,0); // Opaque tilemap_draw(bitmap,cliprect,tilemap_0b,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,tilemap_1,0,0); return 0; } diff --git a/src/mame/video/cninja.c b/src/mame/video/cninja.c index d992e7d3b5e..36c2530ae57 100644 --- a/src/mame/video/cninja.c +++ b/src/mame/video/cninja.c @@ -408,7 +408,7 @@ VIDEO_UPDATE( cninja ) deco16_tilemap_3_draw(bitmap,cliprect,0,2); deco16_tilemap_2_draw(bitmap,cliprect,TILEMAP_DRAW_LAYER1,2); deco16_tilemap_2_draw(bitmap,cliprect,TILEMAP_DRAW_LAYER0,4); - cninja_draw_sprites(machine,bitmap,cliprect); + cninja_draw_sprites(screen->machine,bitmap,cliprect); deco16_tilemap_1_draw(bitmap,cliprect,0,0); return 0; } @@ -427,7 +427,7 @@ VIDEO_UPDATE( edrandy ) else deco16_tilemap_3_draw(bitmap,cliprect,0,2); deco16_tilemap_2_draw(bitmap,cliprect,0,4); - cninja_draw_sprites(machine,bitmap,cliprect); + cninja_draw_sprites(screen->machine,bitmap,cliprect); deco16_tilemap_1_draw(bitmap,cliprect,0,0); return 0; } @@ -475,7 +475,7 @@ VIDEO_UPDATE( robocop2 ) break; } - robocop2_draw_sprites(machine,bitmap,cliprect); + robocop2_draw_sprites(screen->machine,bitmap,cliprect); deco16_tilemap_1_draw(bitmap,cliprect,0,0); return 0; } @@ -512,14 +512,14 @@ VIDEO_UPDATE( mutantf ) transparent against the background, rather than 50% */ if (deco16_priority&1) { fillbitmap(priority_bitmap,0,cliprect); - mutantf_draw_sprites(machine,bitmap,cliprect,buffered_spriteram16,3); + mutantf_draw_sprites(screen->machine,bitmap,cliprect,buffered_spriteram16,3); fillbitmap(priority_bitmap,0,cliprect); - mutantf_draw_sprites(machine,bitmap,cliprect,buffered_spriteram16_2,4); + mutantf_draw_sprites(screen->machine,bitmap,cliprect,buffered_spriteram16_2,4); } else { fillbitmap(priority_bitmap,0,cliprect); - mutantf_draw_sprites(machine,bitmap,cliprect,buffered_spriteram16_2,4); + mutantf_draw_sprites(screen->machine,bitmap,cliprect,buffered_spriteram16_2,4); fillbitmap(priority_bitmap,0,cliprect); - mutantf_draw_sprites(machine,bitmap,cliprect,buffered_spriteram16,3); + mutantf_draw_sprites(screen->machine,bitmap,cliprect,buffered_spriteram16,3); } deco16_tilemap_1_draw(bitmap,cliprect,0,0); return 0; diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c index beb3decf4c1..ebe560d5d42 100644 --- a/src/mame/video/combatsc.c +++ b/src/mame/video/combatsc.c @@ -489,15 +489,13 @@ VIDEO_UPDATE( combasc ) { int i; - set_pens(machine->colortable); + set_pens(screen->machine->colortable); if (K007121_ctrlram[0][0x01] & 0x02) { tilemap_set_scroll_rows(bg_tilemap[0],32); for (i = 0;i < 32;i++) - { tilemap_set_scrollx(bg_tilemap[0],i,combasc_scrollram0[i]); - } } else { @@ -509,9 +507,7 @@ VIDEO_UPDATE( combasc ) { tilemap_set_scroll_rows(bg_tilemap[1],32); for (i = 0;i < 32;i++) - { tilemap_set_scrollx(bg_tilemap[1],i,combasc_scrollram1[i]); - } } else { @@ -532,8 +528,8 @@ VIDEO_UPDATE( combasc ) tilemap_draw(bitmap,cliprect,bg_tilemap[0],1,2); /* we use the priority buffer so sprites are drawn front to back */ - draw_sprites(machine,bitmap,cliprect,private_spriteram[1],1,0x0f00); - draw_sprites(machine,bitmap,cliprect,private_spriteram[0],0,0x4444); + draw_sprites(screen->machine,bitmap,cliprect,private_spriteram[1],1,0x0f00); + draw_sprites(screen->machine,bitmap,cliprect,private_spriteram[0],0,0x4444); } else { @@ -543,8 +539,8 @@ VIDEO_UPDATE( combasc ) tilemap_draw(bitmap,cliprect,bg_tilemap[1],0,8); /* we use the priority buffer so sprites are drawn front to back */ - draw_sprites(machine,bitmap,cliprect,private_spriteram[1],1,0x0f00); - draw_sprites(machine,bitmap,cliprect,private_spriteram[0],0,0x4444); + draw_sprites(screen->machine,bitmap,cliprect,private_spriteram[1],1,0x0f00); + draw_sprites(screen->machine,bitmap,cliprect,private_spriteram[0],0,0x4444); } if (K007121_ctrlram[0][0x01] & 0x08) @@ -649,7 +645,7 @@ VIDEO_UPDATE( combascb ) { int i; - set_pens(machine->colortable); + set_pens(screen->machine->colortable); for( i=0; i<32; i++ ) { @@ -662,16 +658,16 @@ VIDEO_UPDATE( combascb ) if (priority == 0) { tilemap_draw( bitmap,cliprect,bg_tilemap[1],TILEMAP_DRAW_OPAQUE,0); - bootleg_draw_sprites(machine, bitmap,cliprect, combasc_page[0], 0 ); + bootleg_draw_sprites(screen->machine, bitmap,cliprect, combasc_page[0], 0 ); tilemap_draw( bitmap,cliprect,bg_tilemap[0],0 ,0); - bootleg_draw_sprites(machine, bitmap,cliprect, combasc_page[1], 1 ); + bootleg_draw_sprites(screen->machine, bitmap,cliprect, combasc_page[1], 1 ); } else { tilemap_draw( bitmap,cliprect,bg_tilemap[0],TILEMAP_DRAW_OPAQUE,0); - bootleg_draw_sprites(machine, bitmap,cliprect, combasc_page[0], 0 ); + bootleg_draw_sprites(screen->machine, bitmap,cliprect, combasc_page[0], 0 ); tilemap_draw( bitmap,cliprect,bg_tilemap[1],0 ,0); - bootleg_draw_sprites(machine, bitmap,cliprect, combasc_page[1], 1 ); + bootleg_draw_sprites(screen->machine, bitmap,cliprect, combasc_page[1], 1 ); } tilemap_draw( bitmap,cliprect,textlayer,0,0); diff --git a/src/mame/video/commando.c b/src/mame/video/commando.c index 6d1c731175d..902bcf2d8ae 100644 --- a/src/mame/video/commando.c +++ b/src/mame/video/commando.c @@ -130,7 +130,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( commando ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/compgolf.c b/src/mame/video/compgolf.c index 962886a7f3c..e44fc0d5399 100644 --- a/src/mame/video/compgolf.c +++ b/src/mame/video/compgolf.c @@ -127,6 +127,6 @@ VIDEO_UPDATE( compgolf ) tilemap_draw(bitmap, cliprect, background_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, text_tilemap, 0, 0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/contra.c b/src/mame/video/contra.c index b0e665ae601..1d266a5c836 100644 --- a/src/mame/video/contra.c +++ b/src/mame/video/contra.c @@ -288,7 +288,7 @@ VIDEO_UPDATE( contra ) sect_rect(&fg_finalclip, cliprect); sect_rect(&tx_finalclip, cliprect); - set_pens(machine->colortable); + set_pens(screen->machine->colortable); tilemap_set_scrollx( fg_tilemap,0, K007121_ctrlram[0][0x00] - 40 ); tilemap_set_scrolly( fg_tilemap,0, K007121_ctrlram[0][0x02] ); @@ -297,8 +297,8 @@ VIDEO_UPDATE( contra ) tilemap_draw( bitmap,&bg_finalclip, bg_tilemap, 0 ,0); tilemap_draw( bitmap,&fg_finalclip, fg_tilemap, 0 ,0); - draw_sprites( machine,bitmap,cliprect, 0 ); - draw_sprites( machine,bitmap,cliprect, 1 ); + draw_sprites( screen->machine,bitmap,cliprect, 0 ); + draw_sprites( screen->machine,bitmap,cliprect, 1 ); tilemap_draw( bitmap,&tx_finalclip, tx_tilemap, 0 ,0); return 0; } diff --git a/src/mame/video/cop01.c b/src/mame/video/cop01.c index 16daed03f70..d6c5ff9e318 100644 --- a/src/mame/video/cop01.c +++ b/src/mame/video/cop01.c @@ -212,7 +212,7 @@ VIDEO_UPDATE( cop01 ) tilemap_set_scrolly(bg_tilemap,0,mightguy_vreg[3]); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0 ); return 0; diff --git a/src/mame/video/copsnrob.c b/src/mame/video/copsnrob.c index ec58190efb3..d408fb9e7ef 100644 --- a/src/mame/video/copsnrob.c +++ b/src/mame/video/copsnrob.c @@ -28,7 +28,7 @@ VIDEO_UPDATE( copsnrob ) sx = 31 - (offs % 32); sy = offs / 32; - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], videoram[offs] & 0x3f,0, 0,0, 8*sx,8*sy, @@ -38,28 +38,28 @@ VIDEO_UPDATE( copsnrob ) /* Draw the cars. Positioning was based on a screen shot */ if (copsnrob_cary[0]) - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], copsnrob_carimage[0],0, 1,0, 0xe4,256-copsnrob_cary[0], cliprect,TRANSPARENCY_PEN,0); if (copsnrob_cary[1]) - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], copsnrob_carimage[1],0, 1,0, 0xc4,256-copsnrob_cary[1], cliprect,TRANSPARENCY_PEN,0); if (copsnrob_cary[2]) - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], copsnrob_carimage[2],0, 0,0, 0x24,256-copsnrob_cary[2], cliprect,TRANSPARENCY_PEN,0); if (copsnrob_cary[3]) - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], copsnrob_carimage[3],0, 0,0, 0x04,256-copsnrob_cary[3], @@ -89,7 +89,7 @@ VIDEO_UPDATE( copsnrob ) { /* We've hit a truck's back end, so draw the truck. The front end may be off the top of the screen, but we don't care. */ - drawgfx(bitmap,machine->gfx[2], + drawgfx(bitmap,screen->machine->gfx[2], 0,0, 0,0, 0x80,256-(y+31), @@ -102,7 +102,7 @@ VIDEO_UPDATE( copsnrob ) { /* We missed a truck's back end (it was off the bottom of the screen) but have hit its front end, so draw the truck. */ - drawgfx(bitmap,machine->gfx[2], + drawgfx(bitmap,screen->machine->gfx[2], 0,0, 0,0, 0x80,256-y, @@ -134,7 +134,7 @@ VIDEO_UPDATE( copsnrob ) { if (val & mask1) { - for (y = 0; y <= machine->screen[0].visarea.max_y; y++) + for (y = 0; y <= screen->machine->screen[0].visarea.max_y; y++) if (copsnrob_bulletsram[y] & mask2) *BITMAP_ADDR16(bitmap, y, 256-x) = 1; } diff --git a/src/mame/video/cosmic.c b/src/mame/video/cosmic.c index 1a06ec8d04e..89978274d51 100644 --- a/src/mame/video/cosmic.c +++ b/src/mame/video/cosmic.c @@ -555,7 +555,7 @@ VIDEO_UPDATE( panic ) { fillbitmap(bitmap, 0, cliprect); draw_bitmap(bitmap, cliprect); - draw_sprites(machine, bitmap, cliprect, 0x07, 1); + draw_sprites(screen->machine, bitmap, cliprect, 0x07, 1); return 0; } @@ -565,7 +565,7 @@ VIDEO_UPDATE( cosmica ) fillbitmap(bitmap, 0, cliprect); cosmica_draw_starfield(bitmap, cliprect); draw_bitmap(bitmap, cliprect); - draw_sprites(machine, bitmap, cliprect, 0x0f, 0); + draw_sprites(screen->machine, bitmap, cliprect, 0x0f, 0); return 0; } @@ -574,7 +574,7 @@ VIDEO_UPDATE( magspot ) { fillbitmap(bitmap, 0, cliprect); draw_bitmap(bitmap, cliprect); - draw_sprites(machine, bitmap, cliprect, 0x07, 0); + draw_sprites(screen->machine, bitmap, cliprect, 0x07, 0); return 0; } @@ -587,7 +587,7 @@ VIDEO_UPDATE( devzone ) devzone_draw_grid(bitmap, cliprect); draw_bitmap(bitmap, cliprect); - draw_sprites(machine, bitmap, cliprect, 0x07, 0); + draw_sprites(screen->machine, bitmap, cliprect, 0x07, 0); return 0; } @@ -599,7 +599,7 @@ VIDEO_UPDATE( nomnlnd ) fillbitmap(bitmap, 0, cliprect); draw_bitmap(bitmap, cliprect); - draw_sprites(machine, bitmap, cliprect, 0x07, 0); + draw_sprites(screen->machine, bitmap, cliprect, 0x07, 0); if (background_enable) nomnlnd_draw_background(bitmap, cliprect); diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c index 624158dc388..a08ff97b982 100644 --- a/src/mame/video/cps1.c +++ b/src/mame/video/cps1.c @@ -1815,7 +1815,7 @@ VIDEO_UPDATE( cps1 ) cps2_find_last_sprite(); } /* Build palette */ - cps1_build_palette(machine); + cps1_build_palette(screen->machine); cps1_update_transmasks(); @@ -1858,13 +1858,13 @@ VIDEO_UPDATE( cps1 ) if (cps_version == 1) { - cps1_render_layer(machine,bitmap,cliprect,l0,0); + cps1_render_layer(screen->machine,bitmap,cliprect,l0,0); if (l1 == 0) cps1_render_high_layer(bitmap,cliprect,l0); /* prepare mask for sprites */ - cps1_render_layer(machine,bitmap,cliprect,l1,0); + cps1_render_layer(screen->machine,bitmap,cliprect,l1,0); if (l2 == 0) cps1_render_high_layer(bitmap,cliprect,l1); /* prepare mask for sprites */ - cps1_render_layer(machine,bitmap,cliprect,l2,0); + cps1_render_layer(screen->machine,bitmap,cliprect,l2,0); if (l3 == 0) cps1_render_high_layer(bitmap,cliprect,l2); /* prepare mask for sprites */ - cps1_render_layer(machine,bitmap,cliprect,l3,0); + cps1_render_layer(screen->machine,bitmap,cliprect,l3,0); } else { @@ -1915,10 +1915,10 @@ if (0 && input_code_pressed(KEYCODE_Z)) } } - cps1_render_layer(machine,bitmap,cliprect,l0,1); - cps1_render_layer(machine,bitmap,cliprect,l1,2); - cps1_render_layer(machine,bitmap,cliprect,l2,4); - cps2_render_sprites(machine,bitmap,cliprect,primasks); + cps1_render_layer(screen->machine,bitmap,cliprect,l0,1); + cps1_render_layer(screen->machine,bitmap,cliprect,l1,2); + cps1_render_layer(screen->machine,bitmap,cliprect,l2,4); + cps2_render_sprites(screen->machine,bitmap,cliprect,primasks); } #if CPS1_DUMP_VIDEO diff --git a/src/mame/video/crbaloon.c b/src/mame/video/crbaloon.c index d04d21dc5a6..2d6b33e7815 100644 --- a/src/mame/video/crbaloon.c +++ b/src/mame/video/crbaloon.c @@ -154,7 +154,7 @@ VIDEO_UPDATE( crbaloon ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprite_and_check_collision(machine, bitmap); + draw_sprite_and_check_collision(screen->machine, bitmap); return 0; } diff --git a/src/mame/video/crospang.c b/src/mame/video/crospang.c index 75f115e97be..660a03b8ba5 100644 --- a/src/mame/video/crospang.c +++ b/src/mame/video/crospang.c @@ -205,6 +205,6 @@ VIDEO_UPDATE( crospang ) { tilemap_draw(bitmap,cliprect,bg_layer,0,0); tilemap_draw(bitmap,cliprect,fg_layer,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/crshrace.c b/src/mame/video/crshrace.c index 540dd4daf6e..5b525cfabe3 100644 --- a/src/mame/video/crshrace.c +++ b/src/mame/video/crshrace.c @@ -187,7 +187,7 @@ VIDEO_UPDATE( crshrace ) { if (gfxctrl & 0x04) /* display disable? */ { - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); return 0; } @@ -196,7 +196,7 @@ VIDEO_UPDATE( crshrace ) switch (gfxctrl & 0xfb) { case 0x00: /* high score screen */ - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); draw_bg(bitmap,cliprect); draw_fg(bitmap,cliprect); break; @@ -204,7 +204,7 @@ VIDEO_UPDATE( crshrace ) case 0x02: draw_bg(bitmap,cliprect); draw_fg(bitmap,cliprect); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); break; default: popmessage("gfxctrl = %02x",gfxctrl); diff --git a/src/mame/video/csk.c b/src/mame/video/csk.c index e17c124bbec..09f3fdb6161 100644 --- a/src/mame/video/csk.c +++ b/src/mame/video/csk.c @@ -179,7 +179,7 @@ VIDEO_UPDATE( cska ) sx = offs % 64; sy = offs / 64; - drawgfx(bitmap,machine->gfx[1+(offs % 4)], + drawgfx(bitmap,screen->machine->gfx[1+(offs % 4)], cpk_expram[offs], 0, 0,0, @@ -199,7 +199,7 @@ VIDEO_UPDATE( cska ) sx = offs % 64; sy = offs / 64; - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], tile, color, 0,0, diff --git a/src/mame/video/cvs.c b/src/mame/video/cvs.c index 95fa5383fec..f49028830e4 100644 --- a/src/mame/video/cvs.c +++ b/src/mame/video/cvs.c @@ -214,7 +214,7 @@ VIDEO_UPDATE( cvs ) bitmap_t *s2636_1_bitmap; bitmap_t *s2636_2_bitmap; - set_pens(machine->colortable); + set_pens(screen->machine->colortable); /* create our background character set, which is a software selectable mixture of RAM and ROM based tiles */ @@ -223,11 +223,11 @@ VIDEO_UPDATE( cvs ) /* ROM based tiles first */ for (code = 0; code < ram_based_char_start_indices[character_banking_mode]; code++) - decodechar(machine->gfx[0], code, memory_region(REGION_GFX1)); + decodechar(screen->machine->gfx[0], code, memory_region(REGION_GFX1)); /* now the RAM based ones */ for (; code < 0x100; code++) - decodechar(machine->gfx[0], code, cvs_character_ram); + decodechar(screen->machine->gfx[0], code, cvs_character_ram); /* draw the background */ for (offs = 0; offs < 0x0400; offs++) @@ -240,7 +240,7 @@ VIDEO_UPDATE( cvs ) UINT8 x = offs << 3; UINT8 y = offs >> 5 << 3; - drawgfx(background_bitmap, machine->gfx[0], + drawgfx(background_bitmap, screen->machine->gfx[0], code, color, 0, 0, x, y, @@ -257,7 +257,7 @@ VIDEO_UPDATE( cvs ) collision_color = 0x102; } - drawgfx(cvs_collision_background, machine->gfx[0], + drawgfx(cvs_collision_background, screen->machine->gfx[0], code, collision_color, 0, 0, x, y, @@ -301,7 +301,7 @@ VIDEO_UPDATE( cvs ) cvs_collision_register |= 0x08; /* Bullet/Background Collision */ - if (colortable_entry_get_value(machine->colortable, *BITMAP_ADDR16(scrolled_collision_background, offs, bx))) + if (colortable_entry_get_value(screen->machine->colortable, *BITMAP_ADDR16(scrolled_collision_background, offs, bx))) cvs_collision_register |= 0x80; *BITMAP_ADDR16(bitmap, offs, bx) = BULLET_STAR_PEN; @@ -336,7 +336,7 @@ VIDEO_UPDATE( cvs ) if (S2636_IS_PIXEL_DRAWN(pixel0) && S2636_IS_PIXEL_DRAWN(pixel2)) cvs_collision_register |= 0x04; /* S2636 vs. background collision detection */ - if (colortable_entry_get_value(machine->colortable, *BITMAP_ADDR16(scrolled_collision_background, y, x))) + if (colortable_entry_get_value(screen->machine->colortable, *BITMAP_ADDR16(scrolled_collision_background, y, x))) { if (S2636_IS_PIXEL_DRAWN(pixel0)) cvs_collision_register |= 0x10; if (S2636_IS_PIXEL_DRAWN(pixel1)) cvs_collision_register |= 0x20; @@ -357,8 +357,8 @@ VIDEO_UPDATE( cvs ) UINT8 x = (stars[offs].x + stars_scroll) >> 1; UINT8 y = stars[offs].y + ((stars_scroll + stars[offs].x) >> 9); - if (y >= machine->screen[0].visarea.min_y && - y <= machine->screen[0].visarea.max_y) + if (y >= screen->machine->screen[0].visarea.min_y && + y <= screen->machine->screen[0].visarea.max_y) { if ((y & 1) ^ ((x >> 4) & 1)) { @@ -368,7 +368,7 @@ VIDEO_UPDATE( cvs ) if (flip_screen_y_get()) y = ~y; - if (colortable_entry_get_value(machine->colortable, *BITMAP_ADDR16(bitmap, y, x)) == 0) + if (colortable_entry_get_value(screen->machine->colortable, *BITMAP_ADDR16(bitmap, y, x)) == 0) *BITMAP_ADDR16(bitmap, y, x) = BULLET_STAR_PEN; } } diff --git a/src/mame/video/cyberbal.c b/src/mame/video/cyberbal.c index 92f2670f48a..2f45b114f7b 100644 --- a/src/mame/video/cyberbal.c +++ b/src/mame/video/cyberbal.c @@ -407,6 +407,6 @@ static void update_one_screen(running_machine* machine, int screen, bitmap_t *bi VIDEO_UPDATE( cyberbal ) { - update_one_screen(machine, screen, bitmap, cliprect); + update_one_screen(screen->machine, scrnum, bitmap, cliprect); return 0; } diff --git a/src/mame/video/darius.c b/src/mame/video/darius.c index 450a5560b5d..cd05b7d35b4 100644 --- a/src/mame/video/darius.c +++ b/src/mame/video/darius.c @@ -127,7 +127,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( darius ) { - int xoffs = 36*8*screen; + int xoffs = 36*8*scrnum; PC080SN_tilemap_update(); @@ -135,12 +135,12 @@ VIDEO_UPDATE( darius ) PC080SN_tilemap_draw_offset(bitmap,cliprect,0,0,TILEMAP_DRAW_OPAQUE,0,-xoffs,0); /* Sprites can be under/over the layer below text layer */ - draw_sprites(machine,bitmap,cliprect,0,xoffs,-8); // draw sprites with priority 0 which are under the mid layer + draw_sprites(screen->machine,bitmap,cliprect,0,xoffs,-8); // draw sprites with priority 0 which are under the mid layer // draw middle layer PC080SN_tilemap_draw_offset(bitmap,cliprect,0,1,0,0,-xoffs,0); - draw_sprites(machine,bitmap,cliprect,1,xoffs,-8); // draw sprites with priority 1 which are over the mid layer + draw_sprites(screen->machine,bitmap,cliprect,1,xoffs,-8); // draw sprites with priority 1 which are over the mid layer /* top(text) layer is in fixed position */ tilemap_set_scrollx(fg_tilemap,0,0+xoffs); diff --git a/src/mame/video/darkmist.c b/src/mame/video/darkmist.c index a5fcb32f163..aec9b3ad353 100644 --- a/src/mame/video/darkmist.c +++ b/src/mame/video/darkmist.c @@ -134,14 +134,14 @@ VIDEO_UPDATE( darkmist) #define DM_GETSCROLL(n) (((darkmist_scroll[(n)]<<1)&0xff) + ((darkmist_scroll[(n)]&0x80)?1:0) +( ((darkmist_scroll[(n)-1]<<4) | (darkmist_scroll[(n)-1]<<12) )&0xff00)) - set_pens(machine->colortable); + set_pens(screen->machine->colortable); tilemap_set_scrollx(bgtilemap, 0, DM_GETSCROLL(0x2)); tilemap_set_scrolly(bgtilemap, 0, DM_GETSCROLL(0x6)); tilemap_set_scrollx(fgtilemap, 0, DM_GETSCROLL(0xa)); tilemap_set_scrolly(fgtilemap, 0, DM_GETSCROLL(0xe)); - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); if(darkmist_hw & DISPLAY_BG) tilemap_draw(bitmap,cliprect,bgtilemap, 0,0); @@ -176,12 +176,12 @@ VIDEO_UPDATE( darkmist) palette=((spriteram[i+1])>>1)&0xf; if(spriteram[i+1]&0x1) - palette=mame_rand(machine)&15; + palette=mame_rand(screen->machine)&15; palette+=32; drawgfx( - bitmap,machine->gfx[2], + bitmap,screen->machine->gfx[2], tile, palette, fx,fy, diff --git a/src/mame/video/darkseal.c b/src/mame/video/darkseal.c index 00c69810647..09caac481c6 100644 --- a/src/mame/video/darkseal.c +++ b/src/mame/video/darkseal.c @@ -304,7 +304,7 @@ VIDEO_UPDATE( darkseal ) tilemap_draw(bitmap,cliprect,pf3_tilemap,0,0); tilemap_draw(bitmap,cliprect,pf2_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,pf1_tilemap,0,0); return 0; } diff --git a/src/mame/video/dassault.c b/src/mame/video/dassault.c index f00dfc73428..b10d68280f1 100644 --- a/src/mame/video/dassault.c +++ b/src/mame/video/dassault.c @@ -172,7 +172,7 @@ VIDEO_UPDATE( dassault ) /* Draw playfields/update priority bitmap */ deco16_clear_sprite_priority_bitmap(); fillbitmap(priority_bitmap,0,cliprect); - fillbitmap(bitmap,machine->pens[3072],cliprect); + fillbitmap(bitmap,screen->machine->pens[3072],cliprect); deco16_tilemap_4_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE,0); /* The middle playfields can be swapped priority-wise */ @@ -190,7 +190,7 @@ VIDEO_UPDATE( dassault ) } /* Draw sprites - two sprite generators, with selectable priority */ - draw_sprites(machine,bitmap,cliprect,deco16_priority); + draw_sprites(screen->machine,bitmap,cliprect,deco16_priority); deco16_tilemap_1_draw(bitmap,cliprect,0,0); return 0; } diff --git a/src/mame/video/dbz.c b/src/mame/video/dbz.c index f86683aed9f..c3280386ec7 100644 --- a/src/mame/video/dbz.c +++ b/src/mame/video/dbz.c @@ -175,20 +175,14 @@ VIDEO_UPDATE( dbz ) } if(layer[plane] == 4) - { K053936_1_zoom_draw(bitmap,cliprect,dbz_bg1_tilemap,flag,pri); - } else if(layer[plane] == 5) - { K053936_0_zoom_draw(bitmap,cliprect,dbz_bg2_tilemap,flag,pri); - } else - { - K056832_tilemap_draw(machine, bitmap,cliprect,layer[plane],flag,pri); - } + K056832_tilemap_draw(screen->machine, bitmap,cliprect,layer[plane],flag,pri); } - K053247_sprites_draw(machine, bitmap, cliprect); + K053247_sprites_draw(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/dcon.c b/src/mame/video/dcon.c index 96c05c4780a..f9e5d3d3026 100644 --- a/src/mame/video/dcon.c +++ b/src/mame/video/dcon.c @@ -288,7 +288,7 @@ VIDEO_UPDATE( dcon ) tilemap_draw(bitmap,cliprect,foreground_layer,0,2); tilemap_draw(bitmap,cliprect,text_layer,0,4); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } @@ -324,6 +324,6 @@ VIDEO_UPDATE( sdgndmps ) tilemap_draw(bitmap,cliprect,foreground_layer,0,2); tilemap_draw(bitmap,cliprect,text_layer,0,4); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/dday.c b/src/mame/video/dday.c index aee7401859c..e69594ffda8 100644 --- a/src/mame/video/dday.c +++ b/src/mame/video/dday.c @@ -332,7 +332,7 @@ VIDEO_UPDATE( dday ) UINT16 src_pixel = *BITMAP_ADDR16(main_bitmap, y, x); if (*BITMAP_ADDR16(sl_bitmap, y, x) == 0xff) - src_pixel += machine->config->total_colors; + src_pixel += screen->machine->config->total_colors; *BITMAP_ADDR16(bitmap, y, x) = src_pixel; } diff --git a/src/mame/video/ddragon.c b/src/mame/video/ddragon.c index 6a108b2fb51..f24153e8466 100644 --- a/src/mame/video/ddragon.c +++ b/src/mame/video/ddragon.c @@ -253,7 +253,7 @@ VIDEO_UPDATE( ddragon ) tilemap_set_scrolly(bg_tilemap,0,scrolly); tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); return 0; } diff --git a/src/mame/video/ddragon3.c b/src/mame/video/ddragon3.c index d3e219aa0ef..f6a5a25ec1e 100644 --- a/src/mame/video/ddragon3.c +++ b/src/mame/video/ddragon3.c @@ -184,18 +184,18 @@ VIDEO_UPDATE( ddragon3 ) { tilemap_draw(bitmap, cliprect, bg_tilemap, TILEMAP_DRAW_OPAQUE, 0); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); } else if ((ddragon3_vreg & 0x60) == 0x60) { tilemap_draw(bitmap, cliprect, fg_tilemap, TILEMAP_DRAW_OPAQUE, 0); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); } else { tilemap_draw(bitmap, cliprect, bg_tilemap, TILEMAP_DRAW_OPAQUE, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); } return 0; @@ -211,14 +211,14 @@ VIDEO_UPDATE( ctribe ) if(ddragon3_vreg & 8) { tilemap_draw(bitmap, cliprect, fg_tilemap, TILEMAP_DRAW_OPAQUE, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); } else { tilemap_draw(bitmap, cliprect, bg_tilemap, TILEMAP_DRAW_OPAQUE, 0); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); } return 0; } diff --git a/src/mame/video/ddrible.c b/src/mame/video/ddrible.c index 1e56981a08e..95febdb187f 100644 --- a/src/mame/video/ddrible.c +++ b/src/mame/video/ddrible.c @@ -252,7 +252,7 @@ static void draw_sprites(running_machine* machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( ddrible ) { - set_pens(machine->colortable); + set_pens(screen->machine->colortable); tilemap_set_flip(fg_tilemap, (ddribble_vregs[0][4] & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); tilemap_set_flip(bg_tilemap, (ddribble_vregs[1][4] & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); @@ -264,8 +264,8 @@ VIDEO_UPDATE( ddrible ) tilemap_set_scrolly(bg_tilemap,0,ddribble_vregs[1][0]); tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect,ddrible_spriteram_1,0x07d,2,ddribble_vregs[0][4] & 0x08); - draw_sprites(machine,bitmap,cliprect,ddrible_spriteram_2,0x140,3,ddribble_vregs[1][4] & 0x08); + draw_sprites(screen->machine,bitmap,cliprect,ddrible_spriteram_1,0x07d,2,ddribble_vregs[0][4] & 0x08); + draw_sprites(screen->machine,bitmap,cliprect,ddrible_spriteram_2,0x140,3,ddribble_vregs[1][4] & 0x08); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); return 0; } diff --git a/src/mame/video/deadang.c b/src/mame/video/deadang.c index cf6f39f22fb..ccf1ea30b84 100644 --- a/src/mame/video/deadang.c +++ b/src/mame/video/deadang.c @@ -147,12 +147,12 @@ VIDEO_UPDATE( deadang ) tilemap_set_enable(pf2_layer,!(deadang_scroll_ram[0x34]&4)); flip_screen_set( deadang_scroll_ram[0x34]&0x40 ); - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); fillbitmap(priority_bitmap,0,cliprect); tilemap_draw(bitmap,cliprect,pf3_layer,0,1); tilemap_draw(bitmap,cliprect,pf1_layer,0,2); tilemap_draw(bitmap,cliprect,pf2_layer,0,4); - if (!(deadang_scroll_ram[0x34]&0x10)) draw_sprites(machine,bitmap,cliprect); + if (!(deadang_scroll_ram[0x34]&0x10)) draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,text_layer,0,0); return 0; } diff --git a/src/mame/video/dec0.c b/src/mame/video/dec0.c index e3a63b7f8fc..ada5430376f 100644 --- a/src/mame/video/dec0.c +++ b/src/mame/video/dec0.c @@ -350,12 +350,12 @@ VIDEO_UPDATE( hbarrel ) flip_screen_set(dec0_pf1_control_0[0]&0x80); dec0_pf3_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE); - draw_sprites(machine,bitmap,cliprect,0x08,0x08); + draw_sprites(screen->machine,bitmap,cliprect,0x08,0x08); dec0_pf2_draw(bitmap,cliprect,0); /* HB always keeps pf2 on top of pf3, no need explicitly support priority register */ - draw_sprites(machine,bitmap,cliprect,0x08,0x00); + draw_sprites(screen->machine,bitmap,cliprect,0x08,0x00); dec0_pf1_draw(bitmap,cliprect,0); return 0; } @@ -375,7 +375,7 @@ VIDEO_UPDATE( baddudes ) if (dec0_pri & 2) dec0_pf2_draw(bitmap,cliprect,TILEMAP_DRAW_LAYER0); /* Foreground pens only */ - draw_sprites(machine,bitmap,cliprect,0x00,0x00); + draw_sprites(screen->machine,bitmap,cliprect,0x00,0x00); if (dec0_pri & 4) dec0_pf3_draw(bitmap,cliprect,TILEMAP_DRAW_LAYER0); /* Foreground pens only */ @@ -388,7 +388,7 @@ VIDEO_UPDATE( baddudes ) if (dec0_pri & 2) dec0_pf3_draw(bitmap,cliprect,TILEMAP_DRAW_LAYER0); /* Foreground pens only */ - draw_sprites(machine,bitmap,cliprect,0x00,0x00); + draw_sprites(screen->machine,bitmap,cliprect,0x00,0x00); if (dec0_pri & 4) dec0_pf2_draw(bitmap,cliprect,TILEMAP_DRAW_LAYER0); /* Foreground pens only */ @@ -420,7 +420,7 @@ VIDEO_UPDATE( robocop ) dec0_pf2_draw(bitmap,cliprect,TILEMAP_DRAW_LAYER1|TILEMAP_DRAW_OPAQUE); if (dec0_pri & 0x02) - draw_sprites(machine,bitmap,cliprect,0x08,trans); + draw_sprites(screen->machine,bitmap,cliprect,0x08,trans); dec0_pf3_draw(bitmap,cliprect,0); } @@ -429,15 +429,15 @@ VIDEO_UPDATE( robocop ) dec0_pf3_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE); if (dec0_pri & 0x02) - draw_sprites(machine,bitmap,cliprect,0x08,trans); + draw_sprites(screen->machine,bitmap,cliprect,0x08,trans); dec0_pf2_draw(bitmap,cliprect,0); } if (dec0_pri & 0x02) - draw_sprites(machine,bitmap,cliprect,0x08,trans ^ 0x08); + draw_sprites(screen->machine,bitmap,cliprect,0x08,trans ^ 0x08); else - draw_sprites(machine,bitmap,cliprect,0x00,0x00); + draw_sprites(screen->machine,bitmap,cliprect,0x00,0x00); dec0_pf1_draw(bitmap,cliprect,0); return 0; @@ -451,9 +451,9 @@ VIDEO_UPDATE( birdtry ) /* This game doesn't have the extra playfield chip on the game board, but the palette does show through. */ - fillbitmap(bitmap,machine->pens[768],cliprect); + fillbitmap(bitmap,screen->machine->pens[768],cliprect); dec0_pf2_draw(bitmap,cliprect,0); - draw_sprites(machine,bitmap,cliprect,0x00,0x00); + draw_sprites(screen->machine,bitmap,cliprect,0x00,0x00); dec0_pf1_draw(bitmap,cliprect,0); return 0; } @@ -475,7 +475,7 @@ VIDEO_UPDATE( hippodrm ) dec0_pf2_draw(bitmap,cliprect,0); } - draw_sprites(machine,bitmap,cliprect,0x00,0x00); + draw_sprites(screen->machine,bitmap,cliprect,0x00,0x00); dec0_pf1_draw(bitmap,cliprect,0); return 0; } @@ -489,7 +489,7 @@ VIDEO_UPDATE( slyspy ) dec0_pf3_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE); dec0_pf2_draw(bitmap,cliprect,0); - draw_sprites(machine,bitmap,cliprect,0x00,0x00); + draw_sprites(screen->machine,bitmap,cliprect,0x00,0x00); /* Redraw top 8 pens of top 8 palettes over sprites */ if (dec0_pri&0x80) @@ -516,7 +516,7 @@ VIDEO_UPDATE( midres ) dec0_pf2_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE); if (dec0_pri & 0x02) - draw_sprites(machine,bitmap,cliprect,0x08,trans); + draw_sprites(screen->machine,bitmap,cliprect,0x08,trans); dec0_pf3_draw(bitmap,cliprect,0); } @@ -525,15 +525,15 @@ VIDEO_UPDATE( midres ) dec0_pf3_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE); if (dec0_pri & 0x02) - draw_sprites(machine,bitmap,cliprect,0x08,trans); + draw_sprites(screen->machine,bitmap,cliprect,0x08,trans); dec0_pf2_draw(bitmap,cliprect,0); } if (dec0_pri & 0x02) - draw_sprites(machine,bitmap,cliprect,0x08,trans ^ 0x08); + draw_sprites(screen->machine,bitmap,cliprect,0x08,trans ^ 0x08); else - draw_sprites(machine,bitmap,cliprect,0x00,0x00); + draw_sprites(screen->machine,bitmap,cliprect,0x00,0x00); dec0_pf1_draw(bitmap,cliprect,0); return 0; diff --git a/src/mame/video/dec8.c b/src/mame/video/dec8.c index a7ac9975799..f57c9699f0e 100644 --- a/src/mame/video/dec8.c +++ b/src/mame/video/dec8.c @@ -451,9 +451,9 @@ VIDEO_UPDATE( cobracom ) flip_screen_set(dec8_pf0_control[0]>>7); tilemap_draw(bitmap,cliprect,dec8_pf0_tilemap,0,0); - draw_sprites2(machine,bitmap,cliprect,1); + draw_sprites2(screen->machine,bitmap,cliprect,1); tilemap_draw(bitmap,cliprect,dec8_pf1_tilemap,0,0); - draw_sprites2(machine,bitmap,cliprect,2); + draw_sprites2(screen->machine,bitmap,cliprect,2); tilemap_draw(bitmap,cliprect,dec8_fix_tilemap,0,0); return 0; } @@ -539,7 +539,7 @@ VIDEO_UPDATE( ghostb ) tilemap_set_scrolly( dec8_pf0_tilemap,0, (dec8_pf0_control[0x12]<<8)+dec8_pf0_control[0x13] ); tilemap_draw(bitmap,cliprect,dec8_pf0_tilemap,0,0); - draw_sprites1(machine,bitmap,cliprect,0); + draw_sprites1(screen->machine,bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,dec8_fix_tilemap,0,0); return 0; } @@ -578,7 +578,7 @@ VIDEO_UPDATE( oscar ) tilemap_draw(bitmap,cliprect,dec8_pf0_tilemap,TILEMAP_DRAW_LAYER1 | 0,0); tilemap_draw(bitmap,cliprect,dec8_pf0_tilemap,TILEMAP_DRAW_LAYER1 | 1,0); tilemap_draw(bitmap,cliprect,dec8_pf0_tilemap,TILEMAP_DRAW_LAYER0 | 0,0); - draw_sprites2(machine,bitmap,cliprect,0); + draw_sprites2(screen->machine,bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,dec8_pf0_tilemap,TILEMAP_DRAW_LAYER0 | 1,0); tilemap_draw(bitmap,cliprect,dec8_fix_tilemap,0,0); return 0; @@ -617,7 +617,7 @@ VIDEO_UPDATE( lastmiss ) tilemap_set_scrolly( dec8_pf0_tilemap,0, ((scroll2[2]<<8)+scroll2[3]) ); tilemap_draw(bitmap,cliprect,dec8_pf0_tilemap,0,0); - draw_sprites1(machine,bitmap,cliprect,0); + draw_sprites1(screen->machine,bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,dec8_fix_tilemap,0,0); return 0; } @@ -630,7 +630,7 @@ VIDEO_UPDATE( shackled ) tilemap_draw(bitmap,cliprect,dec8_pf0_tilemap,TILEMAP_DRAW_LAYER1 | 0,0); tilemap_draw(bitmap,cliprect,dec8_pf0_tilemap,TILEMAP_DRAW_LAYER1 | 1,0); tilemap_draw(bitmap,cliprect,dec8_pf0_tilemap,TILEMAP_DRAW_LAYER0 | 0,0); - draw_sprites1(machine,bitmap,cliprect,0); + draw_sprites1(screen->machine,bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,dec8_pf0_tilemap,TILEMAP_DRAW_LAYER0 | 1,0); tilemap_draw(bitmap,cliprect,dec8_fix_tilemap,0,0); return 0; @@ -696,9 +696,9 @@ VIDEO_UPDATE( srdarwin ) tilemap_set_scrollx( dec8_pf0_tilemap,0, (scroll2[0]<<8)+scroll2[1] ); tilemap_draw(bitmap,cliprect,dec8_pf0_tilemap,TILEMAP_DRAW_LAYER1,0); - srdarwin_draw_sprites(machine,bitmap,cliprect,0); //* (srdarwin37b5gre) + srdarwin_draw_sprites(screen->machine,bitmap,cliprect,0); //* (srdarwin37b5gre) tilemap_draw(bitmap,cliprect,dec8_pf0_tilemap,TILEMAP_DRAW_LAYER0,0); - srdarwin_draw_sprites(machine,bitmap,cliprect,1); + srdarwin_draw_sprites(screen->machine,bitmap,cliprect,1); tilemap_draw(bitmap,cliprect,dec8_fix_tilemap,0,0); return 0; } @@ -755,9 +755,9 @@ VIDEO_UPDATE( gondo ) tilemap_set_scrolly( dec8_pf0_tilemap,0, ((scroll2[2]<<8)+scroll2[3]) ); tilemap_draw(bitmap,cliprect,dec8_pf0_tilemap,TILEMAP_DRAW_LAYER1,0); - draw_sprites1(machine,bitmap,cliprect,2); + draw_sprites1(screen->machine,bitmap,cliprect,2); tilemap_draw(bitmap,cliprect,dec8_pf0_tilemap,TILEMAP_DRAW_LAYER0,0); - draw_sprites1(machine,bitmap,cliprect,1); + draw_sprites1(screen->machine,bitmap,cliprect,1); tilemap_draw(bitmap,cliprect,dec8_fix_tilemap,0,0); return 0; } @@ -768,7 +768,7 @@ VIDEO_UPDATE( garyoret ) tilemap_set_scrolly( dec8_pf0_tilemap,0, ((scroll2[2]<<8)+scroll2[3]) ); tilemap_draw(bitmap,cliprect,dec8_pf0_tilemap,0,0); - draw_sprites1(machine,bitmap,cliprect,0); + draw_sprites1(screen->machine,bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,dec8_pf0_tilemap,1,0); tilemap_draw(bitmap,cliprect,dec8_fix_tilemap,0,0); return 0; diff --git a/src/mame/video/deco32.c b/src/mame/video/deco32.c index 8e339b1c5f4..7362f6a3094 100644 --- a/src/mame/video/deco32.c +++ b/src/mame/video/deco32.c @@ -1243,7 +1243,7 @@ VIDEO_UPDATE( captaven ) if (pf3_enable) tilemap_draw(bitmap,cliprect,pf3_tilemap,TILEMAP_DRAW_OPAQUE,0); else - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); if (deco32_raster_display_position) tilemap_raster_draw(bitmap,cliprect,0,1); @@ -1257,12 +1257,12 @@ VIDEO_UPDATE( captaven ) tilemap_draw(bitmap,cliprect,pf2_tilemap,0,0); } else - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); tilemap_draw(bitmap,cliprect,pf3_tilemap,0,1); } - captaven_draw_sprites(machine,bitmap,cliprect,buffered_spriteram32,3); + captaven_draw_sprites(screen->machine,bitmap,cliprect,buffered_spriteram32,3); /* PF1 can be in 8x8 mode or 16x16 mode */ if (deco32_pf12_control[6]&0x80) @@ -1308,7 +1308,7 @@ VIDEO_UPDATE( dragngun ) tilemap_set_enable(pf4_tilemap, deco32_pf34_control[5]&0x8000); if ((deco32_pf34_control[5]&0x8000)==0) - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); tilemap_draw(bitmap,cliprect,pf4_tilemap,0,0); tilemap_draw(bitmap,cliprect,pf3_tilemap,0,0); @@ -1347,7 +1347,7 @@ VIDEO_UPDATE( dragngun ) tilemap_draw(bitmap,cliprect,pf2_tilemap,0,0); } - dragngun_draw_sprites(machine,bitmap,cliprect,buffered_spriteram32); + dragngun_draw_sprites(screen->machine,bitmap,cliprect,buffered_spriteram32); /* PF1 can be in 8x8 mode or 16x16 mode */ if (deco32_pf12_control[6]&0x80) @@ -1395,11 +1395,11 @@ VIDEO_UPDATE( fghthist ) /* Draw screen */ deco16_clear_sprite_priority_bitmap(); fillbitmap(priority_bitmap,0,cliprect); - fillbitmap(bitmap,machine->pens[0x000],cliprect); // Palette index not confirmed + fillbitmap(bitmap,screen->machine->pens[0x000],cliprect); // Palette index not confirmed tilemap_draw(bitmap,cliprect,pf4_tilemap,0,1); tilemap_draw(bitmap,cliprect,pf3_tilemap,0,4); tilemap_draw(bitmap,cliprect,pf2_tilemap,0,16); - fghthist_draw_sprites(machine, bitmap, cliprect, buffered_spriteram32,3,0, 0xf); + fghthist_draw_sprites(screen->machine, bitmap, cliprect, buffered_spriteram32,3,0, 0xf); tilemap_draw(bitmap,cliprect,pf1_tilemap,0,0); return 0; } @@ -1583,18 +1583,18 @@ VIDEO_UPDATE( nslasher ) alphaTilemap=1; if (deco32_ace_ram_dirty) - updateAceRam(machine); + updateAceRam(screen->machine); fillbitmap(sprite0_mix_bitmap,0,cliprect); fillbitmap(sprite1_mix_bitmap,0,cliprect); fillbitmap(priority_bitmap,0,cliprect); fillbitmap(tilemap_alpha_bitmap,0,cliprect); if ((deco32_pf34_control[5]&0x8000)==0) - fillbitmap(bitmap,machine->pens[0x200],cliprect); + fillbitmap(bitmap,screen->machine->pens[0x200],cliprect); /* Draw sprites to temporary bitmaps, saving alpha & priority info for later mixing */ - nslasher_draw_sprites(machine,sprite0_mix_bitmap,cliprect,buffered_spriteram32,3); - nslasher_draw_sprites(machine,sprite1_mix_bitmap,cliprect,buffered_spriteram32_2,4); + nslasher_draw_sprites(screen->machine,sprite0_mix_bitmap,cliprect,buffered_spriteram32,3); + nslasher_draw_sprites(screen->machine,sprite1_mix_bitmap,cliprect,buffered_spriteram32_2,4); /* Render alpha-blended tilemap to seperate buffer for proper mixing */ if (alphaTilemap) @@ -1603,7 +1603,7 @@ VIDEO_UPDATE( nslasher ) /* Draw playfields & sprites */ if (deco32_pri&2) { - combined_tilemap_draw(machine,bitmap,cliprect); + combined_tilemap_draw(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,pf2_tilemap,0,4); } else @@ -1627,7 +1627,7 @@ VIDEO_UPDATE( nslasher ) } } - mixDualAlphaSprites(machine, bitmap, cliprect, machine->gfx[3], machine->gfx[4], alphaTilemap); + mixDualAlphaSprites(screen->machine, bitmap, cliprect, screen->machine->gfx[3], screen->machine->gfx[4], alphaTilemap); tilemap_draw(bitmap,cliprect,pf1_tilemap,0,0); return 0; diff --git a/src/mame/video/deco_mlc.c b/src/mame/video/deco_mlc.c index fb233e3c5a7..d1a13d1755a 100644 --- a/src/mame/video/deco_mlc.c +++ b/src/mame/video/deco_mlc.c @@ -527,7 +527,7 @@ VIDEO_EOF( mlc ) VIDEO_UPDATE( mlc ) { // fillbitmap(temp_bitmap,0,cliprect); - fillbitmap(bitmap,machine->pens[0],cliprect); /* Pen 0 fill colour confirmed from Skull Fang level 2 */ - draw_sprites(machine,bitmap,cliprect); + fillbitmap(bitmap,screen->machine->pens[0],cliprect); /* Pen 0 fill colour confirmed from Skull Fang level 2 */ + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/decocass.c b/src/mame/video/decocass.c index 44b7b6dc5d8..4da3281f140 100644 --- a/src/mame/video/decocass.c +++ b/src/mame/video/decocass.c @@ -608,13 +608,13 @@ VIDEO_UPDATE( decocass ) int scrollx, scrolly_l, scrolly_r; rectangle clip; - if (0xc0 != (input_port_2_r(machine, 0) & 0xc0)) /* coin slots assert an NMI */ - cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, ASSERT_LINE); + if (0xc0 != (input_port_2_r(screen->machine, 0) & 0xc0)) /* coin slots assert an NMI */ + cpunum_set_input_line(screen->machine, 0, INPUT_LINE_NMI, ASSERT_LINE); if (0 == (watchdog_flip & 0x04)) - watchdog_reset_w (machine,0,0); + watchdog_reset(screen->machine); else if (watchdog_count-- > 0) - watchdog_reset_w (machine,0,0); + watchdog_reset(screen->machine); #if TAPE_UI_DISPLAY if (tape_timer) @@ -648,9 +648,9 @@ VIDEO_UPDATE( decocass ) } #endif - fillbitmap( bitmap, machine->pens[0], cliprect ); + fillbitmap( bitmap, 0, cliprect ); - decode_modified(machine, decocass_fgvideoram, 0x20 ); + decode_modified(screen->machine, decocass_fgvideoram, 0x20 ); scrolly_l = back_vl_shift; scrolly_r = 256 - back_vr_shift; @@ -689,12 +689,12 @@ VIDEO_UPDATE( decocass ) if (mode_set & 0x20) { - draw_object(machine,bitmap,cliprect); + draw_object(screen->machine,bitmap,cliprect); draw_center(bitmap,cliprect); } else { - draw_object(machine,bitmap,cliprect); + draw_object(screen->machine,bitmap,cliprect); draw_center(bitmap,cliprect); if (mode_set & 0x08) /* bkg_ena on ? */ { @@ -708,7 +708,7 @@ VIDEO_UPDATE( decocass ) } } tilemap_draw(bitmap,cliprect, fg_tilemap, 0, 0); - draw_sprites(machine,bitmap,cliprect, (color_center_bot >> 1) & 1, 0, 0, decocass_fgvideoram, 0x20); + draw_sprites(screen->machine,bitmap,cliprect, (color_center_bot >> 1) & 1, 0, 0, decocass_fgvideoram, 0x20); draw_missiles(bitmap,cliprect, 1, 0, decocass_colorram, 0x20); return 0; } diff --git a/src/mame/video/destroyr.c b/src/mame/video/destroyr.c index b9b11ef507d..30e91bd1ebc 100644 --- a/src/mame/video/destroyr.c +++ b/src/mame/video/destroyr.c @@ -43,7 +43,7 @@ VIDEO_UPDATE( destroyr ) continue; } - drawgfx(bitmap, machine->gfx[2], num, 0, flipx, 0, + drawgfx(bitmap, screen->machine->gfx[2], num, 0, flipx, 0, horz, 16 * i, cliprect, TRANSPARENCY_PEN, 0); } @@ -55,7 +55,7 @@ VIDEO_UPDATE( destroyr ) { int num = destroyr_alpha_num_ram[32 * i + j]; - drawgfx(bitmap, machine->gfx[0], num, 0, 0, 0, + drawgfx(bitmap, screen->machine->gfx[0], num, 0, 0, 0, 8 * j, 8 * i, cliprect, TRANSPARENCY_PEN, 0); } } @@ -67,7 +67,7 @@ VIDEO_UPDATE( destroyr ) int horz = 256 - destroyr_minor_obj_ram[i + 2]; int vert = 256 - destroyr_minor_obj_ram[i + 4]; - drawgfx(bitmap, machine->gfx[1], destroyr_minor_obj_ram[i + 0], 0, 0, 0, + drawgfx(bitmap, screen->machine->gfx[1], destroyr_minor_obj_ram[i + 0], 0, 0, 0, horz, vert, cliprect, TRANSPARENCY_PEN, 0); } @@ -75,7 +75,7 @@ VIDEO_UPDATE( destroyr ) for (i = 0; i < 4; i++) { - drawgfx(bitmap, machine->gfx[3], destroyr_wavemod ? 1 : 0, 0, 0, 0, + drawgfx(bitmap, screen->machine->gfx[3], destroyr_wavemod ? 1 : 0, 0, 0, 0, 64 * i, 0x4e, cliprect, TRANSPARENCY_PEN, 0); } diff --git a/src/mame/video/dietgo.c b/src/mame/video/dietgo.c index 6dc156019db..20d05129eaf 100644 --- a/src/mame/video/dietgo.c +++ b/src/mame/video/dietgo.c @@ -88,6 +88,6 @@ VIDEO_UPDATE(dietgo) deco16_tilemap_2_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE,0); deco16_tilemap_1_draw(bitmap,cliprect,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/digdug.c b/src/mame/video/digdug.c index ecac71492e8..e5ae8736f41 100644 --- a/src/mame/video/digdug.c +++ b/src/mame/video/digdug.c @@ -314,7 +314,6 @@ VIDEO_UPDATE( digdug ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); - - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/diverboy.c b/src/mame/video/diverboy.c index 7e61860832d..4c065e4c5a5 100644 --- a/src/mame/video/diverboy.c +++ b/src/mame/video/diverboy.c @@ -47,7 +47,7 @@ static void draw_sprites(running_machine* machine, bitmap_t *bitmap, const recta VIDEO_UPDATE(diverboy) { -// fillbitmap(bitmap,get_black_pen(machine),cliprect); - draw_sprites(machine,bitmap,cliprect); +// fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/djboy.c b/src/mame/video/djboy.c index 63ae9a90762..bf3189a02ae 100644 --- a/src/mame/video/djboy.c +++ b/src/mame/video/djboy.c @@ -74,7 +74,7 @@ VIDEO_UPDATE( djboy ) scroll = djboy_scrolly | ((djboy_videoreg&0x20)<<3); tilemap_set_scrolly( background, 0, scroll ); tilemap_draw( bitmap, cliprect,background,0,0 ); - pandora_update(machine,bitmap,cliprect); + pandora_update(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/djmain.c b/src/mame/video/djmain.c index b66cd0a9a9a..76b3374c598 100644 --- a/src/mame/video/djmain.c +++ b/src/mame/video/djmain.c @@ -173,7 +173,7 @@ VIDEO_UPDATE( djmain ) order[j] = temp; } - fillbitmap(bitmap, machine->pens[0], cliprect); + fillbitmap(bitmap, screen->machine->pens[0], cliprect); for (i = 0; i < NUM_LAYERS + 1; i++) { @@ -182,12 +182,12 @@ VIDEO_UPDATE( djmain ) if (layer == NUM_LAYERS) { if (enables & K55_INP_SUB2) - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); } else { if (enables & (K55_INP_VRAM_A << layer)) - K056832_tilemap_draw_dj(machine, bitmap, cliprect, layer, 0, 1 << i); + K056832_tilemap_draw_dj(screen->machine, bitmap, cliprect, layer, 0, 1 << i); } } return 0; diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c index 5f52deb31bd..26a15475c77 100644 --- a/src/mame/video/dkong.c +++ b/src/mame/video/dkong.c @@ -919,7 +919,7 @@ VIDEO_START( dkong ) VIDEO_UPDATE( dkong ) { - dkong_state *state = machine->driver_data; + dkong_state *state = screen->machine->driver_data; tilemap_set_flip(ALL_TILEMAPS, state->flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); tilemap_set_scrollx(state->bg_tilemap, 0, state->flip ? 0 : 0); @@ -929,15 +929,15 @@ VIDEO_UPDATE( dkong ) { case HARDWARE_TKG02: case HARDWARE_TKG04: - check_palette(machine); + check_palette(screen->machine); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect, 0x40, 1); + draw_sprites(screen->machine, bitmap, cliprect, 0x40, 1); break; case HARDWARE_TRS01: case HARDWARE_TRS02: tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect, 0x40, 1); - radarscp_draw_background(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect, 0x40, 1); + radarscp_draw_background(screen->machine, bitmap, cliprect); break; default: fatalerror("Invalid hardware type in dkong_video_update"); @@ -947,7 +947,7 @@ VIDEO_UPDATE( dkong ) VIDEO_UPDATE( pestplce ) { - dkong_state *state = machine->driver_data; + dkong_state *state = screen->machine->driver_data; int offs; tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -957,7 +957,7 @@ VIDEO_UPDATE( pestplce ) { if (state->sprite_ram[offs]) { - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], state->sprite_ram[offs + 2], (state->sprite_ram[offs + 1] & 0x0f) + 16 * state->palette_bank, state->sprite_ram[offs + 1] & 0x80,state->sprite_ram[offs + 1] & 0x40, @@ -970,11 +970,11 @@ VIDEO_UPDATE( pestplce ) VIDEO_UPDATE( spclforc ) { - dkong_state *state = machine->driver_data; + dkong_state *state = screen->machine->driver_data; tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); /* it uses sprite_ram[offs + 2] & 0x10 for sprite bank */ - draw_sprites(machine, bitmap, cliprect, 0x10, 3); + draw_sprites(screen->machine, bitmap, cliprect, 0x10, 3); return 0; } diff --git a/src/mame/video/docastle.c b/src/mame/video/docastle.c index 3575e8ff22d..fa6b13756ec 100644 --- a/src/mame/video/docastle.c +++ b/src/mame/video/docastle.c @@ -219,7 +219,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( docastle ) { tilemap_draw(bitmap, cliprect, docastle_tilemap, TILEMAP_DRAW_OPAQUE, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, docastle_tilemap, TILEMAP_DRAW_LAYER0, 0); return 0; } diff --git a/src/mame/video/dogfgt.c b/src/mame/video/dogfgt.c index 3b06bc410b7..3be26e9c6eb 100644 --- a/src/mame/video/dogfgt.c +++ b/src/mame/video/dogfgt.c @@ -230,13 +230,13 @@ VIDEO_UPDATE( dogfgt ) lastpixcolor = pixcolor; for (offs = 0;offs < BITMAPRAM_SIZE;offs++) - internal_bitmapram_w(machine,offs,bitmapram[offs]); + internal_bitmapram_w(screen->machine,offs,bitmapram[offs]); } tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); copybitmap_trans(bitmap,pixbitmap,0,0,0,0,cliprect,PIXMAP_COLOR_BASE + 8*pixcolor); return 0; diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c index 696b7740d6d..f1a7966a88e 100644 --- a/src/mame/video/dooyong.c +++ b/src/mame/video/dooyong.c @@ -506,7 +506,7 @@ static void rshark_draw_sprites(running_machine *machine, bitmap_t *bitmap, cons VIDEO_UPDATE( lastday ) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); fillbitmap(priority_bitmap, 0, cliprect); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 1); @@ -514,39 +514,39 @@ VIDEO_UPDATE( lastday ) tilemap_draw(bitmap, cliprect, tx_tilemap, 0, 4); if (!sprites_disabled) - draw_sprites(machine, bitmap, cliprect, 0); + draw_sprites(screen->machine, bitmap, cliprect, 0); return 0; } VIDEO_UPDATE( gulfstrm ) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); fillbitmap(priority_bitmap, 0, cliprect); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 1); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 2); tilemap_draw(bitmap, cliprect, tx_tilemap, 0, 4); - draw_sprites(machine, bitmap, cliprect, 1); + draw_sprites(screen->machine, bitmap, cliprect, 1); return 0; } VIDEO_UPDATE( pollux ) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); fillbitmap(priority_bitmap, 0, cliprect); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 1); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 2); tilemap_draw(bitmap, cliprect, tx_tilemap, 0, 4); - draw_sprites(machine, bitmap, cliprect, 2); + draw_sprites(screen->machine, bitmap, cliprect, 2); return 0; } VIDEO_UPDATE( flytiger ) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); fillbitmap(priority_bitmap, 0, cliprect); if (flytiger_pri) @@ -561,14 +561,14 @@ VIDEO_UPDATE( flytiger ) } tilemap_draw(bitmap, cliprect, tx_tilemap, 0, 4); - draw_sprites(machine, bitmap, cliprect, 4); + draw_sprites(screen->machine, bitmap, cliprect, 4); return 0; } VIDEO_UPDATE( bluehawk ) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); fillbitmap(priority_bitmap, 0, cliprect); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 1); @@ -576,13 +576,13 @@ VIDEO_UPDATE( bluehawk ) tilemap_draw(bitmap, cliprect, fg2_tilemap, 0, 4); tilemap_draw(bitmap, cliprect, tx_tilemap, 0, 4); - draw_sprites(machine, bitmap, cliprect, 3); + draw_sprites(screen->machine, bitmap, cliprect, 3); return 0; } VIDEO_UPDATE( primella ) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); if (tx_pri) tilemap_draw(bitmap, cliprect, tx_tilemap, 0, 0); @@ -593,7 +593,7 @@ VIDEO_UPDATE( primella ) VIDEO_UPDATE( rshark ) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); fillbitmap(priority_bitmap, 0, cliprect); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 1); @@ -601,18 +601,18 @@ VIDEO_UPDATE( rshark ) tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 2); tilemap_draw(bitmap, cliprect, fg2_tilemap, 0, 2); - rshark_draw_sprites(machine, bitmap, cliprect); + rshark_draw_sprites(screen->machine, bitmap, cliprect); return 0; } VIDEO_UPDATE( popbingo ) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); fillbitmap(priority_bitmap, 0, cliprect); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 1); - rshark_draw_sprites(machine, bitmap, cliprect); + rshark_draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/drgnmst.c b/src/mame/video/drgnmst.c index aee5de7aabf..f197963561d 100644 --- a/src/mame/video/drgnmst.c +++ b/src/mame/video/drgnmst.c @@ -200,7 +200,7 @@ VIDEO_UPDATE(drgnmst) } - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); // popmessage ("x %04x x %04x x %04x x %04x x %04x", drgnmst_vidregs2[0], drgnmst_vidregs[12], drgnmst_vidregs[13], drgnmst_vidregs[14], drgnmst_vidregs[15]); // popmessage ("x %04x x %04x y %04x y %04x z %04x z %04x",drgnmst_vidregs[0],drgnmst_vidregs[1],drgnmst_vidregs[2],drgnmst_vidregs[3],drgnmst_vidregs[4],drgnmst_vidregs[5]); diff --git a/src/mame/video/drmicro.c b/src/mame/video/drmicro.c index 483ae91c79c..6f19b0c3621 100644 --- a/src/mame/video/drmicro.c +++ b/src/mame/video/drmicro.c @@ -154,7 +154,7 @@ VIDEO_UPDATE( drmicro ) else x = (240-x) & 0xff; - drawgfx(bitmap,machine->gfx[3-g], + drawgfx(bitmap,screen->machine->gfx[3-g], chr, col, fx,fy, @@ -163,7 +163,7 @@ VIDEO_UPDATE( drmicro ) if (x>240) { - drawgfx(bitmap,machine->gfx[3-g], + drawgfx(bitmap,screen->machine->gfx[3-g], chr, col, fx,fy, diff --git a/src/mame/video/dynax.c b/src/mame/video/dynax.c index 8789639f9fa..2add0ee0ddd 100644 --- a/src/mame/video/dynax.c +++ b/src/mame/video/dynax.c @@ -1214,14 +1214,14 @@ VIDEO_UPDATE( jantouki ) (dynax_blit_backpen & 0xff) + (dynax_blit_palbank & 1) * 256, cliprect); - if (screen==0) + if (scrnum==0) { // if (layers_ctrl & 0x01) jantouki_copylayer( bitmap, cliprect, 3, 0 ); if (layers_ctrl & 0x02) jantouki_copylayer( bitmap, cliprect, 2, 0 ); if (layers_ctrl & 0x04) jantouki_copylayer( bitmap, cliprect, 1, 0 ); if (layers_ctrl & 0x08) jantouki_copylayer( bitmap, cliprect, 0, 0 ); } - else if (screen==1) + else if (scrnum==1) { if (layers_ctrl & 0x01) jantouki_copylayer( bitmap, cliprect, 3, 0 ); if (layers_ctrl & 0x10) jantouki_copylayer( bitmap, cliprect, 7, 0 ); diff --git a/src/mame/video/dynduke.c b/src/mame/video/dynduke.c index ab362fad312..f3d6941569c 100644 --- a/src/mame/video/dynduke.c +++ b/src/mame/video/dynduke.c @@ -230,14 +230,14 @@ VIDEO_UPDATE( dynduke ) tilemap_set_enable( tx_layer,txt_enable); - draw_background(machine, bitmap, cliprect,0x00); - draw_sprites(machine,bitmap,cliprect,0); // Untested: does anything use it? Could be behind background - draw_sprites(machine,bitmap,cliprect,1); - draw_background(machine, bitmap, cliprect,0x20); + draw_background(screen->machine, bitmap, cliprect,0x00); + draw_sprites(screen->machine,bitmap,cliprect,0); // Untested: does anything use it? Could be behind background + draw_sprites(screen->machine,bitmap,cliprect,1); + draw_background(screen->machine, bitmap, cliprect,0x20); - draw_sprites(machine,bitmap,cliprect,2); + draw_sprites(screen->machine,bitmap,cliprect,2); tilemap_draw(bitmap,cliprect,fg_layer,0,0); - draw_sprites(machine,bitmap,cliprect,3); + draw_sprites(screen->machine,bitmap,cliprect,3); tilemap_draw(bitmap,cliprect,tx_layer,0,0); return 0; diff --git a/src/mame/video/eprom.c b/src/mame/video/eprom.c index 24b6d4c73be..4fd9a302b36 100644 --- a/src/mame/video/eprom.c +++ b/src/mame/video/eprom.c @@ -195,7 +195,7 @@ VIDEO_UPDATE( eprom ) tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); /* draw and merge the MO */ - mobitmap = atarimo_render(machine, 0, cliprect, &rectlist); + mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) { @@ -341,7 +341,7 @@ VIDEO_UPDATE( guts ) tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); /* draw and merge the MO */ - mobitmap = atarimo_render(machine, 0, cliprect, &rectlist); + mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) { diff --git a/src/mame/video/equites.c b/src/mame/video/equites.c index be266ce519a..519a8f8cb4a 100644 --- a/src/mame/video/equites.c +++ b/src/mame/video/equites.c @@ -377,9 +377,9 @@ static void equites_draw_sprites(running_machine *machine, bitmap_t *bitmap, con VIDEO_UPDATE( equites ) { - equites_update_clut(machine); - equites_draw_scroll(machine, bitmap, cliprect); - equites_draw_sprites(machine, bitmap, cliprect); + equites_update_clut(screen->machine); + equites_draw_scroll(screen->machine, bitmap, cliprect); + equites_draw_sprites(screen->machine, bitmap, cliprect); plot_box(bitmap, cliprect->min_x, cliprect->min_y, maskwidth, maskheight, maskcolor); plot_box(bitmap, cliprect->max_x-maskwidth+1, cliprect->min_y, maskwidth, maskheight, maskcolor); tilemap_draw(bitmap, cliprect, charmap0, 0, 0); @@ -538,9 +538,9 @@ static void splndrbt_draw_sprites(running_machine *machine, bitmap_t *bitmap, co VIDEO_UPDATE( splndrbt ) { - splndrbt_update_clut(machine); + splndrbt_update_clut(screen->machine); fillbitmap(bitmap, *bgcolor, &halfclip); - splndrbt_draw_scroll(machine, tmpbitmap); + splndrbt_draw_scroll(screen->machine, tmpbitmap); splndrbt_slantcopy( tmpbitmap, bitmap, cliprect, @@ -548,7 +548,7 @@ VIDEO_UPDATE( splndrbt ) BMW, 434, 96, 480, prestep); tilemap_draw(bitmap, cliprect, charmap1, 0, 0); - splndrbt_draw_sprites(machine, bitmap, cliprect); + splndrbt_draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, charmap0, 0, 0); return 0; } diff --git a/src/mame/video/esd16.c b/src/mame/video/esd16.c index fb714f7079d..9c42a7b41e7 100644 --- a/src/mame/video/esd16.c +++ b/src/mame/video/esd16.c @@ -329,7 +329,7 @@ if ( input_code_pressed(KEYCODE_Z) ) if (layers_ctrl & 2) tilemap_draw(bitmap,cliprect,esdtilemap_1,0,1); - if (layers_ctrl & 4) esd16_draw_sprites(machine,bitmap,cliprect); + if (layers_ctrl & 4) esd16_draw_sprites(screen->machine,bitmap,cliprect); return 0; } @@ -372,7 +372,7 @@ if ( input_code_pressed(KEYCODE_Z) ) } - if (layers_ctrl & 4) hedpanic_draw_sprites(machine,bitmap,cliprect); + if (layers_ctrl & 4) hedpanic_draw_sprites(screen->machine,bitmap,cliprect); // popmessage("%04x %04x %04x %04x %04x",head_unknown1[0],head_layersize[0],head_unknown3[0],head_unknown4[0],head_unknown5[0]); diff --git a/src/mame/video/espial.c b/src/mame/video/espial.c index 7bd6ee0edd4..9b225e72cd4 100644 --- a/src/mame/video/espial.c +++ b/src/mame/video/espial.c @@ -237,7 +237,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( espial ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/exctsccr.c b/src/mame/video/exctsccr.c index 7a56dd6ec69..c004bf3b9f6 100644 --- a/src/mame/video/exctsccr.c +++ b/src/mame/video/exctsccr.c @@ -248,6 +248,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( exctsccr ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/exedexes.c b/src/mame/video/exedexes.c index 49ea82c985e..f19e4b00dd5 100644 --- a/src/mame/video/exedexes.c +++ b/src/mame/video/exedexes.c @@ -224,7 +224,7 @@ VIDEO_UPDATE( exedexes ) else fillbitmap(bitmap, 0, cliprect); - draw_sprites(machine, bitmap, cliprect, 1); + draw_sprites(screen->machine, bitmap, cliprect, 1); if (sc1on) { @@ -233,7 +233,7 @@ VIDEO_UPDATE( exedexes ) tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); } - draw_sprites(machine, bitmap, cliprect, 0); + draw_sprites(screen->machine, bitmap, cliprect, 0); if (chon) tilemap_draw(bitmap, cliprect, tx_tilemap, 0, 0); diff --git a/src/mame/video/exerion.c b/src/mame/video/exerion.c index 2f9c8de63d3..5471658defb 100644 --- a/src/mame/video/exerion.c +++ b/src/mame/video/exerion.c @@ -373,7 +373,7 @@ VIDEO_UPDATE( exerion ) int code2 = code; int color = ((flags >> 1) & 0x03) | ((code >> 5) & 0x04) | (code & 0x08) | (sprite_palette * 16); - const gfx_element *gfx = doubled ? machine->gfx[2] : machine->gfx[1]; + const gfx_element *gfx = doubled ? screen->machine->gfx[2] : screen->machine->gfx[1]; if (exerion_cocktail_flip) { @@ -393,12 +393,12 @@ VIDEO_UPDATE( exerion ) drawgfx(bitmap, gfx, code2, color, xflip, yflip, x, y + gfx->height, cliprect, TRANSPARENCY_PENS, - colortable_get_transpen_mask(machine->colortable, gfx, color, 0x10)); + colortable_get_transpen_mask(screen->machine->colortable, gfx, color, 0x10)); } drawgfx(bitmap, gfx, code, color, xflip, yflip, x, y, cliprect, TRANSPARENCY_PENS, - colortable_get_transpen_mask(machine->colortable, gfx, color, 0x10)); + colortable_get_transpen_mask(screen->machine->colortable, gfx, color, 0x10)); if (doubled) i += 4; } @@ -411,7 +411,7 @@ VIDEO_UPDATE( exerion ) int y = exerion_cocktail_flip ? (31*8 - 8*sy) : 8*sy; offs = sx + sy * 64; - drawgfx(bitmap, machine->gfx[0], + drawgfx(bitmap, screen->machine->gfx[0], videoram[offs] + 256 * char_bank, ((videoram[offs] & 0xf0) >> 4) + char_palette * 16, exerion_cocktail_flip, exerion_cocktail_flip, x, y, diff --git a/src/mame/video/exidy.c b/src/mame/video/exidy.c index 907b18af593..b1d0e581092 100644 --- a/src/mame/video/exidy.c +++ b/src/mame/video/exidy.c @@ -374,17 +374,17 @@ static void check_collision(running_machine *machine) VIDEO_UPDATE( exidy ) { /* refresh the colors from the palette (static or dynamic) */ - set_colors(machine); + set_colors(screen->machine); /* update the background and draw it */ draw_background(); copybitmap(bitmap, background_bitmap, 0, 0, 0, 0, cliprect); /* draw the sprites */ - draw_sprites(machine, bitmap, NULL); + draw_sprites(screen->machine, bitmap, NULL); /* check for collision, this will set the appropriate bits in collision_mask */ - check_collision(machine); + check_collision(screen->machine); return 0; } diff --git a/src/mame/video/exidy440.c b/src/mame/video/exidy440.c index 0602777ef7b..3d57c73f7d4 100644 --- a/src/mame/video/exidy440.c +++ b/src/mame/video/exidy440.c @@ -440,12 +440,12 @@ static VIDEO_UPDATE( exidy440 ) update_screen(bitmap, cliprect, 0, TRUE); /* generate an interrupt once/frame for the beam */ - if (cliprect->max_y == machine->screen[screen].visarea.max_y) + if (cliprect->max_y == screen->machine->screen[scrnum].visarea.max_y) { int i; - int beamx = ((input_port_4_r(machine, 0) & 0xff) * (HBSTART - HBEND)) >> 8; - int beamy = ((input_port_5_r(machine, 0) & 0xff) * (VBSTART - VBEND)) >> 8; + int beamx = ((readinputport(4) & 0xff) * (HBSTART - HBEND)) >> 8; + int beamy = ((readinputport(5) & 0xff) * (VBSTART - VBEND)) >> 8; /* The timing of this FIRQ is very important. The games look for an FIRQ and then wait about 650 cycles, clear the old FIRQ, and wait a diff --git a/src/mame/video/exprraid.c b/src/mame/video/exprraid.c index 1047c77ba80..ebe3b98d316 100644 --- a/src/mame/video/exprraid.c +++ b/src/mame/video/exprraid.c @@ -136,7 +136,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( exprraid ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, bg_tilemap, 1, 0); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); return 0; diff --git a/src/mame/video/exzisus.c b/src/mame/video/exzisus.c index ffc9fbcf06c..0147fa8ac5f 100644 --- a/src/mame/video/exzisus.c +++ b/src/mame/video/exzisus.c @@ -144,7 +144,7 @@ VIDEO_UPDATE( exzisus ) y = 248 - y; } - drawgfx(bitmap, machine->gfx[0], + drawgfx(bitmap, screen->machine->gfx[0], code & 0x3fff, color, flip_screen_get(), flip_screen_get(), @@ -214,7 +214,7 @@ VIDEO_UPDATE( exzisus ) y = 248 - y; } - drawgfx(bitmap, machine->gfx[1], + drawgfx(bitmap, screen->machine->gfx[1], code & 0x3fff, color, flip_screen_get(), flip_screen_get(), diff --git a/src/mame/video/f1gp.c b/src/mame/video/f1gp.c index d54eb2003ea..97ee941ac4d 100644 --- a/src/mame/video/f1gp.c +++ b/src/mame/video/f1gp.c @@ -342,7 +342,7 @@ VIDEO_UPDATE( f1gp ) if (dirtychar[i]) { dirtychar[i] = 0; - decodechar(machine->gfx[3],i,(UINT8 *)zoomdata); + decodechar(screen->machine->gfx[3],i,(UINT8 *)zoomdata); } } @@ -360,13 +360,13 @@ VIDEO_UPDATE( f1gp ) /* quick kludge for "continue" screen priority */ if (gfxctrl == 0x00) { - f1gp_draw_sprites(machine,bitmap,cliprect,0,0x02); - f1gp_draw_sprites(machine,bitmap,cliprect,1,0x02); + f1gp_draw_sprites(screen->machine,bitmap,cliprect,0,0x02); + f1gp_draw_sprites(screen->machine,bitmap,cliprect,1,0x02); } else { - f1gp_draw_sprites(machine,bitmap,cliprect,0,0x00); - f1gp_draw_sprites(machine,bitmap,cliprect,1,0x02); + f1gp_draw_sprites(screen->machine,bitmap,cliprect,0,0x00); + f1gp_draw_sprites(screen->machine,bitmap,cliprect,1,0x02); } return 0; } @@ -387,7 +387,7 @@ VIDEO_UPDATE( f1gpb ) if (dirtychar[i]) { dirtychar[i] = 0; - decodechar(machine->gfx[3],i,(UINT8 *)zoomdata); + decodechar(screen->machine->gfx[3],i,(UINT8 *)zoomdata); } } @@ -411,7 +411,7 @@ VIDEO_UPDATE( f1gpb ) tilemap_draw(bitmap,cliprect,fg_tilemap,0,1); - f1gpb_draw_sprites(machine,bitmap,cliprect); + f1gpb_draw_sprites(screen->machine,bitmap,cliprect); return 0; } @@ -493,27 +493,25 @@ static void f1gp2_draw_sprites(running_machine *machine,bitmap_t *bitmap,const r VIDEO_UPDATE( f1gp2 ) { if (gfxctrl & 4) /* blank screen */ - { - fillbitmap(bitmap, get_black_pen(machine), cliprect); - } + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); else { switch (gfxctrl & 3) { case 0: K053936_0_zoom_draw(bitmap,cliprect,roz_tilemap,TILEMAP_DRAW_OPAQUE,0); - f1gp2_draw_sprites(machine,bitmap,cliprect); + f1gp2_draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); break; case 1: K053936_0_zoom_draw(bitmap,cliprect,roz_tilemap,TILEMAP_DRAW_OPAQUE,0); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); - f1gp2_draw_sprites(machine,bitmap,cliprect); + f1gp2_draw_sprites(screen->machine,bitmap,cliprect); break; case 2: tilemap_draw(bitmap,cliprect,fg_tilemap,TILEMAP_DRAW_OPAQUE,0); K053936_0_zoom_draw(bitmap,cliprect,roz_tilemap,0,0); - f1gp2_draw_sprites(machine,bitmap,cliprect); + f1gp2_draw_sprites(screen->machine,bitmap,cliprect); break; #ifdef MAME_DEBUG case 3: diff --git a/src/mame/video/fantland.c b/src/mame/video/fantland.c index 769486c8e32..c0b5904a50d 100644 --- a/src/mame/video/fantland.c +++ b/src/mame/video/fantland.c @@ -138,7 +138,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( fantland ) { fillbitmap(bitmap,0,cliprect); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/fastfred.c b/src/mame/video/fastfred.c index 9038c1993f9..e7de15c3af5 100644 --- a/src/mame/video/fastfred.c +++ b/src/mame/video/fastfred.c @@ -328,7 +328,7 @@ VIDEO_UPDATE( fastfred ) { fillbitmap(bitmap, *fastfred_background_color, cliprect); tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } @@ -391,9 +391,9 @@ VIDEO_START( imago ) VIDEO_UPDATE( imago ) { tilemap_draw(bitmap,cliprect,web_tilemap,0,0); - galaxian_draw_stars(machine, bitmap); + galaxian_draw_stars(screen->machine, bitmap); tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); return 0; diff --git a/src/mame/video/fastlane.c b/src/mame/video/fastlane.c index c4cfd9751d9..fbfe4b21f1b 100644 --- a/src/mame/video/fastlane.c +++ b/src/mame/video/fastlane.c @@ -153,7 +153,7 @@ VIDEO_UPDATE( fastlane ) sect_rect(&finalclip0, cliprect); sect_rect(&finalclip1, cliprect); - set_pens(machine->colortable); + set_pens(screen->machine->colortable); /* set scroll registers */ xoffs = K007121_ctrlram[0][0x00]; @@ -163,7 +163,7 @@ VIDEO_UPDATE( fastlane ) tilemap_set_scrolly( layer0, 0, K007121_ctrlram[0][0x02] ); tilemap_draw(bitmap,&finalclip0,layer0,0,0); - K007121_sprites_draw(0,bitmap,machine->gfx,machine->colortable,cliprect,spriteram,0,40,0,-1); + K007121_sprites_draw(0,bitmap,screen->machine->gfx,screen->machine->colortable,cliprect,spriteram,0,40,0,-1); tilemap_draw(bitmap,&finalclip1,layer1,0,0); return 0; } diff --git a/src/mame/video/fcombat.c b/src/mame/video/fcombat.c index 7390e1331bb..6acbff1589b 100644 --- a/src/mame/video/fcombat.c +++ b/src/mame/video/fcombat.c @@ -177,7 +177,7 @@ tilemap_mark_all_tiles_dirty(bgmap); int code2 = code; int color = ((flags >> 1) & 0x03) | ((code >> 5) & 0x04) | (code & 0x08) | (sprite_palette * 16); - const gfx_element *gfx = machine->gfx[1]; + const gfx_element *gfx = screen->machine->gfx[1]; if (fcombat_cocktail_flip) { @@ -229,7 +229,7 @@ tilemap_mark_all_tiles_dirty(bgmap); int y = fcombat_cocktail_flip ? (31*8 - 8*sy) : 8*sy; offs = sx + sy * 64; - drawgfx(bitmap, machine->gfx[0], + drawgfx(bitmap, screen->machine->gfx[0], videoram[offs] + 256 * char_bank, ((videoram[offs] & 0xf0) >> 4) + char_palette * 16, fcombat_cocktail_flip, fcombat_cocktail_flip, x, y, diff --git a/src/mame/video/fgoal.c b/src/mame/video/fgoal.c index ccc67c9648e..eb3d58df5f3 100644 --- a/src/mame/video/fgoal.c +++ b/src/mame/video/fgoal.c @@ -53,7 +53,7 @@ VIDEO_UPDATE( fgoal ) if (fgoal_player == 1 && (readinputport(1) & 0x40)) { - drawgfxzoom(fgbitmap, machine->gfx[0], + drawgfxzoom(fgbitmap, screen->machine->gfx[0], 0, (fgoal_player << 2) | current_color, 1, 1, 0, 16, @@ -61,7 +61,7 @@ VIDEO_UPDATE( fgoal ) 0x40000, 0x40000); - drawgfxzoom(bgbitmap, machine->gfx[1], + drawgfxzoom(bgbitmap, screen->machine->gfx[1], 0, 0, 1, 1, 0, 16, @@ -71,7 +71,7 @@ VIDEO_UPDATE( fgoal ) } else { - drawgfxzoom(fgbitmap, machine->gfx[0], + drawgfxzoom(fgbitmap, screen->machine->gfx[0], 0, (fgoal_player << 2) | current_color, 0, 0, 0, 0, @@ -79,7 +79,7 @@ VIDEO_UPDATE( fgoal ) 0x40000, 0x40000); - drawgfxzoom(bgbitmap, machine->gfx[1], + drawgfxzoom(bgbitmap, screen->machine->gfx[1], 0, 0, 0, 0, 0, 0, diff --git a/src/mame/video/finalizr.c b/src/mame/video/finalizr.c index efb53ed3dd8..ebc4be8df83 100644 --- a/src/mame/video/finalizr.c +++ b/src/mame/video/finalizr.c @@ -81,7 +81,7 @@ VIDEO_UPDATE( finalizr ) sx = offs % 32; sy = offs / 32; - drawgfx(tmpbitmap,machine->gfx[0], + drawgfx(tmpbitmap,screen->machine->gfx[0], videoram[offs] + ((colorram[offs] & 0xc0) << 2) + (charbank<<10), (colorram[offs] & 0x0f), colorram[offs] & 0x10,colorram[offs] & 0x20, @@ -130,25 +130,25 @@ VIDEO_UPDATE( finalizr ) case 0x14: /* ? */ case 0x18: /* ? */ case 0x1c: /* ? */ - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], code, color, flipx,flipy, flipx?sx+16:sx,flipy?sy+16:sy, cliprect,TRANSPARENCY_PEN,0); - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], code + 1, color, flipx,flipy, flipx?sx:sx+16,flipy?sy+16:sy, cliprect,TRANSPARENCY_PEN,0); - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], code + 2, color, flipx,flipy, flipx?sx+16:sx,flipy?sy:sy+16, cliprect,TRANSPARENCY_PEN,0); - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], code + 3, color, flipx,flipy, @@ -157,7 +157,7 @@ VIDEO_UPDATE( finalizr ) break; case 0x00: /* 16x16 */ - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], code, color, flipx,flipy, @@ -167,13 +167,13 @@ VIDEO_UPDATE( finalizr ) case 0x04: /* 16x8 */ code = ((code & 0x3ff) << 2) | ((code & 0xc00) >> 10); - drawgfx(bitmap,machine->gfx[2], + drawgfx(bitmap,screen->machine->gfx[2], code & ~1, color, flipx,flipy, flipx?sx+8:sx,sy, cliprect,TRANSPARENCY_PEN,0); - drawgfx(bitmap,machine->gfx[2], + drawgfx(bitmap,screen->machine->gfx[2], code | 1, color, flipx,flipy, @@ -183,13 +183,13 @@ VIDEO_UPDATE( finalizr ) case 0x08: /* 8x16 */ code = ((code & 0x3ff) << 2) | ((code & 0xc00) >> 10); - drawgfx(bitmap,machine->gfx[2], + drawgfx(bitmap,screen->machine->gfx[2], code & ~2, color, flipx,flipy, sx,flipy?sy+8:sy, cliprect,TRANSPARENCY_PEN,0); - drawgfx(bitmap,machine->gfx[2], + drawgfx(bitmap,screen->machine->gfx[2], code | 2, color, flipx,flipy, @@ -199,7 +199,7 @@ VIDEO_UPDATE( finalizr ) case 0x0c: /* 8x8 */ code = ((code & 0x3ff) << 2) | ((code & 0xc00) >> 10); - drawgfx(bitmap,machine->gfx[2], + drawgfx(bitmap,screen->machine->gfx[2], code, color, flipx,flipy, @@ -221,7 +221,7 @@ VIDEO_UPDATE( finalizr ) if (sx >= 3) sx += 30; sy = offs / 32; - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], finalizr_videoram2[offs] + ((finalizr_colorram2[offs] & 0xc0) << 2), (finalizr_colorram2[offs] & 0x0f), finalizr_colorram2[offs] & 0x10,finalizr_colorram2[offs] & 0x20, diff --git a/src/mame/video/firetrap.c b/src/mame/video/firetrap.c index 36b97a4edb2..ce57f9e35cb 100644 --- a/src/mame/video/firetrap.c +++ b/src/mame/video/firetrap.c @@ -290,7 +290,7 @@ VIDEO_UPDATE( firetrap ) { tilemap_draw(bitmap,cliprect,bg2_tilemap,0,0); tilemap_draw(bitmap,cliprect,bg1_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); return 0; } diff --git a/src/mame/video/firetrk.c b/src/mame/video/firetrk.c index feb85710017..c3e985e3858 100644 --- a/src/mame/video/firetrk.c +++ b/src/mame/video/firetrk.c @@ -371,21 +371,21 @@ VIDEO_UPDATE( firetrk ) fillbitmap(bitmap, 0, cliprect); tilemap_draw(bitmap, &playfield_window, tilemap1, 0, 0); - firetrk_draw_car(machine->gfx, bitmap, &playfield_window, 0, firetrk_flash); - firetrk_draw_car(machine->gfx, bitmap, &playfield_window, 1, firetrk_flash); - draw_text(machine->gfx, bitmap, cliprect, firetrk_alpha_num_ram + 0x00, 296, 0x10, 0x10); - draw_text(machine->gfx, bitmap, cliprect, firetrk_alpha_num_ram + 0x10, 8, 0x10, 0x10); + firetrk_draw_car(screen->machine->gfx, bitmap, &playfield_window, 0, firetrk_flash); + firetrk_draw_car(screen->machine->gfx, bitmap, &playfield_window, 1, firetrk_flash); + draw_text(screen->machine->gfx, bitmap, cliprect, firetrk_alpha_num_ram + 0x00, 296, 0x10, 0x10); + draw_text(screen->machine->gfx, bitmap, cliprect, firetrk_alpha_num_ram + 0x10, 8, 0x10, 0x10); - if (cliprect->max_y == machine->screen[screen].visarea.max_y) + if (cliprect->max_y == screen->machine->screen[scrnum].visarea.max_y) { tilemap_draw(helper1, &playfield_window, tilemap2, 0, 0); fillbitmap(helper2, 0xff, &playfield_window); - firetrk_draw_car(machine->gfx, helper2, &playfield_window, 0, FALSE); + firetrk_draw_car(screen->machine->gfx, helper2, &playfield_window, 0, FALSE); check_collision(0); fillbitmap(helper2, 0xff, &playfield_window); - firetrk_draw_car(machine->gfx, helper2, &playfield_window, 1, FALSE); + firetrk_draw_car(screen->machine->gfx, helper2, &playfield_window, 1, FALSE); check_collision(1); *firetrk_blink = FALSE; @@ -405,16 +405,16 @@ VIDEO_UPDATE( superbug ) fillbitmap(bitmap, 0, cliprect); tilemap_draw(bitmap, &playfield_window, tilemap1, 0, 0); - superbug_draw_car(machine->gfx, bitmap, &playfield_window, firetrk_flash); - draw_text(machine->gfx, bitmap, cliprect, firetrk_alpha_num_ram + 0x00, 296, 0x10, 0x10); - draw_text(machine->gfx, bitmap, cliprect, firetrk_alpha_num_ram + 0x10, 8, 0x10, 0x10); + superbug_draw_car(screen->machine->gfx, bitmap, &playfield_window, firetrk_flash); + draw_text(screen->machine->gfx, bitmap, cliprect, firetrk_alpha_num_ram + 0x00, 296, 0x10, 0x10); + draw_text(screen->machine->gfx, bitmap, cliprect, firetrk_alpha_num_ram + 0x10, 8, 0x10, 0x10); - if (cliprect->max_y == machine->screen[screen].visarea.max_y) + if (cliprect->max_y == screen->machine->screen[scrnum].visarea.max_y) { tilemap_draw(helper1, &playfield_window, tilemap2, 0, 0); fillbitmap(helper2, 0xff, &playfield_window); - superbug_draw_car(machine->gfx, helper2, &playfield_window, FALSE); + superbug_draw_car(screen->machine->gfx, helper2, &playfield_window, FALSE); check_collision(0); *firetrk_blink = FALSE; @@ -434,21 +434,21 @@ VIDEO_UPDATE( montecar ) fillbitmap(bitmap, 0x2c, cliprect); tilemap_draw(bitmap, &playfield_window, tilemap1, 0, 0); - montecar_draw_car(machine->gfx, bitmap, &playfield_window, 0, FALSE); - montecar_draw_car(machine->gfx, bitmap, &playfield_window, 1, FALSE); - draw_text(machine->gfx, bitmap, cliprect, firetrk_alpha_num_ram + 0x00, 24, 0x20, 0x08); - draw_text(machine->gfx, bitmap, cliprect, firetrk_alpha_num_ram + 0x20, 16, 0x20, 0x08); + montecar_draw_car(screen->machine->gfx, bitmap, &playfield_window, 0, FALSE); + montecar_draw_car(screen->machine->gfx, bitmap, &playfield_window, 1, FALSE); + draw_text(screen->machine->gfx, bitmap, cliprect, firetrk_alpha_num_ram + 0x00, 24, 0x20, 0x08); + draw_text(screen->machine->gfx, bitmap, cliprect, firetrk_alpha_num_ram + 0x20, 16, 0x20, 0x08); - if (cliprect->max_y == machine->screen[screen].visarea.max_y) + if (cliprect->max_y == screen->machine->screen[scrnum].visarea.max_y) { tilemap_draw(helper1, &playfield_window, tilemap2, 0, 0); fillbitmap(helper2, 0xff, &playfield_window); - montecar_draw_car(machine->gfx, helper2, &playfield_window, 0, TRUE); + montecar_draw_car(screen->machine->gfx, helper2, &playfield_window, 0, TRUE); check_collision(0); fillbitmap(helper2, 0xff, &playfield_window); - montecar_draw_car(machine->gfx, helper2, &playfield_window, 1, TRUE); + montecar_draw_car(screen->machine->gfx, helper2, &playfield_window, 1, TRUE); check_collision(1); } diff --git a/src/mame/video/fitfight.c b/src/mame/video/fitfight.c index 6f7c43c6123..1cc9541c551 100644 --- a/src/mame/video/fitfight.c +++ b/src/mame/video/fitfight.c @@ -123,7 +123,7 @@ VIDEO_UPDATE(fitfight) vblank = (fof_700000[0] & 0x8000); if (vblank > 0) - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); else { // if (input_code_pressed(KEYCODE_Q)) // scrollbak = ((fof_a00000[0]&0xff00) >> 5) - ((fof_700000[0] & 0x0038) >> 3); @@ -139,7 +139,7 @@ VIDEO_UPDATE(fitfight) tilemap_set_scrolly(fof_bak_tilemap,0, fof_a00000[0]&0xff); tilemap_draw(bitmap,cliprect,fof_bak_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect,0); + draw_sprites(screen->machine,bitmap,cliprect,0); // if (input_code_pressed(KEYCODE_A)) // scrollmid = ((fof_900000[0]&0xff00) >> 5) - ((fof_700000[0] & 0x01c0) >> 6); @@ -156,7 +156,7 @@ VIDEO_UPDATE(fitfight) // if (!input_code_pressed(KEYCODE_F)) tilemap_draw(bitmap,cliprect,fof_mid_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect,1); + draw_sprites(screen->machine,bitmap,cliprect,1); tilemap_draw(bitmap,cliprect,fof_txt_tilemap,0,0); } diff --git a/src/mame/video/flkatck.c b/src/mame/video/flkatck.c index d45ec645148..f4ab092e659 100644 --- a/src/mame/video/flkatck.c +++ b/src/mame/video/flkatck.c @@ -140,10 +140,10 @@ popmessage("%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x %02x-%02x-%02x-%02x-%02x-%0 #endif if (k007121_flip_screen) { - k007121_clip[0] = machine->screen[0].visarea; + k007121_clip[0] = screen->machine->screen[0].visarea; k007121_clip[0].max_x -= 40; - k007121_clip[1] = machine->screen[0].visarea; + k007121_clip[1] = screen->machine->screen[0].visarea; k007121_clip[1].min_x = k007121_clip[1].max_x-40; tilemap_set_scrollx(k007121_tilemap[0],0,K007121_ctrlram[0][0x00] - 56 ); @@ -152,10 +152,10 @@ popmessage("%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x %02x-%02x-%02x-%02x-%02x-%0 } else { - k007121_clip[0] = machine->screen[0].visarea; + k007121_clip[0] = screen->machine->screen[0].visarea; k007121_clip[0].min_x += 40; - k007121_clip[1] = machine->screen[0].visarea; + k007121_clip[1] = screen->machine->screen[0].visarea; k007121_clip[1].max_x = 39; k007121_clip[1].min_x = 0; @@ -172,7 +172,7 @@ popmessage("%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x %02x-%02x-%02x-%02x-%02x-%0 /* draw the graphics */ tilemap_draw(bitmap,&final_clip[0],k007121_tilemap[0],0,0); - K007121_sprites_draw(0,bitmap,machine->gfx,NULL,cliprect,&k007121_ram[0x1000],0,40,0,-1); + K007121_sprites_draw(0,bitmap,screen->machine->gfx,NULL,cliprect,&k007121_ram[0x1000],0,40,0,-1); tilemap_draw(bitmap,&final_clip[1],k007121_tilemap[1],0,0); return 0; } diff --git a/src/mame/video/flower.c b/src/mame/video/flower.c index 11aa7c10107..1677d159d35 100644 --- a/src/mame/video/flower.c +++ b/src/mame/video/flower.c @@ -171,7 +171,7 @@ VIDEO_UPDATE( flower ) tilemap_draw(bitmap,cliprect,flower_bg0_tilemap,0,0); tilemap_draw(bitmap,cliprect,flower_bg1_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); if(flip_screen_get()) { diff --git a/src/mame/video/flstory.c b/src/mame/video/flstory.c index a9c6a0839d3..7b2d1a1a721 100644 --- a/src/mame/video/flstory.c +++ b/src/mame/video/flstory.c @@ -187,9 +187,9 @@ VIDEO_UPDATE( flstory ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0|TILEMAP_DRAW_LAYER1,0); tilemap_draw(bitmap,cliprect,bg_tilemap,1|TILEMAP_DRAW_LAYER1,0); - flstory_draw_sprites(machine,bitmap,cliprect,0x00); + flstory_draw_sprites(screen->machine,bitmap,cliprect,0x00); tilemap_draw(bitmap,cliprect,bg_tilemap,0|TILEMAP_DRAW_LAYER0,0); - flstory_draw_sprites(machine,bitmap,cliprect,0x80); + flstory_draw_sprites(screen->machine,bitmap,cliprect,0x80); tilemap_draw(bitmap,cliprect,bg_tilemap,1|TILEMAP_DRAW_LAYER0,0); return 0; } @@ -243,6 +243,6 @@ static void victnine_draw_sprites(running_machine *machine, bitmap_t *bitmap, co VIDEO_UPDATE( victnine ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - victnine_draw_sprites(machine,bitmap,cliprect); + victnine_draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/flyball.c b/src/mame/video/flyball.c index 22012ca286c..f458ac8c55d 100644 --- a/src/mame/video/flyball.c +++ b/src/mame/video/flyball.c @@ -73,17 +73,17 @@ VIDEO_UPDATE( flyball ) /* draw pitcher */ - drawgfx(bitmap, machine->gfx[1], flyball_pitcher_pic ^ 0xf, + drawgfx(bitmap, screen->machine->gfx[1], flyball_pitcher_pic ^ 0xf, 0, 1, 0, pitcherx, pitchery, cliprect, TRANSPARENCY_PEN, 1); /* draw ball */ for (y = bally; y < bally + 2; y++) for (x = ballx; x < ballx + 2; x++) - if (x >= machine->screen[0].visarea.min_x && - x <= machine->screen[0].visarea.max_x && - y >= machine->screen[0].visarea.min_y && - y <= machine->screen[0].visarea.max_y) + if (x >= screen->machine->screen[0].visarea.min_x && + x <= screen->machine->screen[0].visarea.max_x && + y >= screen->machine->screen[0].visarea.min_y && + y <= screen->machine->screen[0].visarea.max_y) *BITMAP_ADDR16(bitmap, y, x) = 1; return 0; } diff --git a/src/mame/video/foodf.c b/src/mame/video/foodf.c index fc6f7e8c56f..23b7f93c31f 100644 --- a/src/mame/video/foodf.c +++ b/src/mame/video/foodf.c @@ -144,11 +144,11 @@ VIDEO_UPDATE( foodf ) int vflip = (data1 >> 14) & 1; int pri = (data1 >> 13) & 1; - pdrawgfx(bitmap, machine->gfx[1], pict, color, hflip, vflip, + pdrawgfx(bitmap, screen->machine->gfx[1], pict, color, hflip, vflip, xpos, ypos, cliprect, TRANSPARENCY_PEN, 0, pri * 2); /* draw again with wraparound (needed to get the end of level animation right) */ - pdrawgfx(bitmap, machine->gfx[1], pict, color, hflip, vflip, + pdrawgfx(bitmap, screen->machine->gfx[1], pict, color, hflip, vflip, xpos - 256, ypos, cliprect, TRANSPARENCY_PEN, 0, pri * 2); } diff --git a/src/mame/video/freekick.c b/src/mame/video/freekick.c index 4d622ceadf8..a62d8d65228 100644 --- a/src/mame/video/freekick.c +++ b/src/mame/video/freekick.c @@ -138,20 +138,20 @@ static void freekick_draw_sprites(running_machine *machine, bitmap_t *bitmap, co VIDEO_UPDATE(gigas) { tilemap_draw(bitmap,cliprect,freek_tilemap,0,0); - gigas_draw_sprites(machine,bitmap,cliprect); + gigas_draw_sprites(screen->machine,bitmap,cliprect); return 0; } VIDEO_UPDATE(pbillrd) { tilemap_draw(bitmap,cliprect,freek_tilemap,0,0); - pbillrd_draw_sprites(machine,bitmap,cliprect); + pbillrd_draw_sprites(screen->machine,bitmap,cliprect); return 0; } VIDEO_UPDATE(freekick) { tilemap_draw(bitmap,cliprect,freek_tilemap,0,0); - freekick_draw_sprites(machine,bitmap,cliprect); + freekick_draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/fromanc2.c b/src/mame/video/fromanc2.c index bc6cd26df7f..7a8d8ad363c 100644 --- a/src/mame/video/fromanc2.c +++ b/src/mame/video/fromanc2.c @@ -463,25 +463,25 @@ VIDEO_START( fromanc4 ) VIDEO_UPDATE( fromanc2 ) { - if (fromanc2_tilemap[screen][0]) { - tilemap_set_scrollx(fromanc2_tilemap[screen][0], 0, -fromanc2_scrollx[screen][0]); - tilemap_set_scrolly(fromanc2_tilemap[screen][0], 0, -fromanc2_scrolly[screen][0]); - tilemap_draw(bitmap,cliprect, fromanc2_tilemap[screen][0], 0, 0); + if (fromanc2_tilemap[scrnum][0]) { + tilemap_set_scrollx(fromanc2_tilemap[scrnum][0], 0, -fromanc2_scrollx[scrnum][0]); + tilemap_set_scrolly(fromanc2_tilemap[scrnum][0], 0, -fromanc2_scrolly[scrnum][0]); + tilemap_draw(bitmap,cliprect, fromanc2_tilemap[scrnum][0], 0, 0); } - if (fromanc2_tilemap[screen][1]) { - tilemap_set_scrollx(fromanc2_tilemap[screen][1], 0, -fromanc2_scrollx[screen][1]); - tilemap_set_scrolly(fromanc2_tilemap[screen][1], 0, -fromanc2_scrolly[screen][1]); - tilemap_draw(bitmap,cliprect, fromanc2_tilemap[screen][1], 0, 0); + if (fromanc2_tilemap[scrnum][1]) { + tilemap_set_scrollx(fromanc2_tilemap[scrnum][1], 0, -fromanc2_scrollx[scrnum][1]); + tilemap_set_scrolly(fromanc2_tilemap[scrnum][1], 0, -fromanc2_scrolly[scrnum][1]); + tilemap_draw(bitmap,cliprect, fromanc2_tilemap[scrnum][1], 0, 0); } - if (fromanc2_tilemap[screen][2]) { - tilemap_set_scrollx(fromanc2_tilemap[screen][2], 0, -fromanc2_scrollx[screen][2]); - tilemap_set_scrolly(fromanc2_tilemap[screen][2], 0, -fromanc2_scrolly[screen][2]); - tilemap_draw(bitmap,cliprect, fromanc2_tilemap[screen][2], 0, 0); + if (fromanc2_tilemap[scrnum][2]) { + tilemap_set_scrollx(fromanc2_tilemap[scrnum][2], 0, -fromanc2_scrollx[scrnum][2]); + tilemap_set_scrolly(fromanc2_tilemap[scrnum][2], 0, -fromanc2_scrolly[scrnum][2]); + tilemap_draw(bitmap,cliprect, fromanc2_tilemap[scrnum][2], 0, 0); } - if (fromanc2_tilemap[screen][3]) { - tilemap_set_scrollx(fromanc2_tilemap[screen][3], 0, -fromanc2_scrollx[screen][3]); - tilemap_set_scrolly(fromanc2_tilemap[screen][3], 0, -fromanc2_scrolly[screen][3]); - tilemap_draw(bitmap,cliprect, fromanc2_tilemap[screen][3], 0, 0); + if (fromanc2_tilemap[scrnum][3]) { + tilemap_set_scrollx(fromanc2_tilemap[scrnum][3], 0, -fromanc2_scrollx[scrnum][3]); + tilemap_set_scrolly(fromanc2_tilemap[scrnum][3], 0, -fromanc2_scrolly[scrnum][3]); + tilemap_draw(bitmap,cliprect, fromanc2_tilemap[scrnum][3], 0, 0); } return 0; diff --git a/src/mame/video/fromance.c b/src/mame/video/fromance.c index 3470c662873..1bbe5aef9c8 100644 --- a/src/mame/video/fromance.c +++ b/src/mame/video/fromance.c @@ -466,7 +466,7 @@ VIDEO_UPDATE( pipedrm ) tilemap_draw(bitmap,cliprect, bg_tilemap, 0, 0); tilemap_draw(bitmap,cliprect, fg_tilemap, 0, 0); - draw_sprites(machine,bitmap,cliprect, 0); - draw_sprites(machine,bitmap,cliprect, 1); + draw_sprites(screen->machine,bitmap,cliprect, 0); + draw_sprites(screen->machine,bitmap,cliprect, 1); return 0; } diff --git a/src/mame/video/funkybee.c b/src/mame/video/funkybee.c index 0d97eb6e969..0c221939853 100644 --- a/src/mame/video/funkybee.c +++ b/src/mame/video/funkybee.c @@ -169,7 +169,7 @@ VIDEO_UPDATE( funkybee ) tilemap_mark_all_tiles_dirty(bg_tilemap); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); - draw_columns(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); + draw_columns(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/funkyjet.c b/src/mame/video/funkyjet.c index c2a102cb789..47779760775 100644 --- a/src/mame/video/funkyjet.c +++ b/src/mame/video/funkyjet.c @@ -85,6 +85,6 @@ VIDEO_UPDATE( funkyjet ) fillbitmap(bitmap,768,cliprect); deco16_tilemap_2_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE,0); deco16_tilemap_1_draw(bitmap,cliprect,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/funybubl.c b/src/mame/video/funybubl.c index cc5b2ca98b2..99b27afc680 100644 --- a/src/mame/video/funybubl.c +++ b/src/mame/video/funybubl.c @@ -82,7 +82,7 @@ VIDEO_UPDATE(funybubl) offs = 0; - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); /* tilemap .. convert it .. banking makes it slightly more annoying but still easy */ @@ -93,12 +93,12 @@ VIDEO_UPDATE(funybubl) int data; data = funybubl_banked_videoram[offs] | (funybubl_banked_videoram[offs+1] << 8); - drawgfx(bitmap,machine->gfx[0],data&0x7fff,(data&0x8000)?2:1,0,0,x*8,y*8,cliprect,TRANSPARENCY_PEN,0); + drawgfx(bitmap,screen->machine->gfx[0],data&0x7fff,(data&0x8000)?2:1,0,0,x*8,y*8,cliprect,TRANSPARENCY_PEN,0); offs+=2; } } - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); /* if ( input_code_pressed_once(KEYCODE_W) ) diff --git a/src/mame/video/fuukifg2.c b/src/mame/video/fuukifg2.c index 30d5bbb396b..d157d3e2356 100644 --- a/src/mame/video/fuukifg2.c +++ b/src/mame/video/fuukifg2.c @@ -347,7 +347,7 @@ VIDEO_UPDATE( fuuki16 ) fuuki16_draw_layer(bitmap,cliprect, tm_middle, 0, 2); fuuki16_draw_layer(bitmap,cliprect, tm_front, 0, 4); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/fuukifg3.c b/src/mame/video/fuukifg3.c index 1a2248df720..db292251924 100644 --- a/src/mame/video/fuukifg3.c +++ b/src/mame/video/fuukifg3.c @@ -373,7 +373,7 @@ VIDEO_UPDATE( fuuki32 ) fuuki32_draw_layer(bitmap,cliprect, tm_middle, 0, 2); fuuki32_draw_layer(bitmap,cliprect, tm_front, 0, 4); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/gaelco.c b/src/mame/video/gaelco.c index 8dc029e6932..3b268a91c1b 100644 --- a/src/mame/video/gaelco.c +++ b/src/mame/video/gaelco.c @@ -210,7 +210,7 @@ VIDEO_UPDATE( maniacsq ) tilemap_draw(bitmap,cliprect,pant[1],0,4); tilemap_draw(bitmap,cliprect,pant[0],0,4); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } @@ -249,6 +249,6 @@ VIDEO_UPDATE( bigkarnk ) tilemap_draw(bitmap,cliprect,pant[1],TILEMAP_DRAW_LAYER0 | 0,8); tilemap_draw(bitmap,cliprect,pant[0],TILEMAP_DRAW_LAYER0 | 0,8); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c index 9f244907989..5150e17e84d 100644 --- a/src/mame/video/gaelco2.c +++ b/src/mame/video/gaelco2.c @@ -460,7 +460,7 @@ VIDEO_UPDATE( gaelco2 ) tilemap_draw(bitmap, cliprect, pant[1], 0, 0); tilemap_draw(bitmap, cliprect, pant[0], 0, 0); - draw_sprites(machine, bitmap, cliprect, 0, 0); + draw_sprites(screen->machine, bitmap, cliprect, 0, 0); return 0; } @@ -487,17 +487,17 @@ VIDEO_UPDATE( gaelco2_dual ) /* draw screen */ fillbitmap(bitmap, 0, cliprect); - if (screen==1) + if (scrnum==1) { /* monitor 2 output */ tilemap_draw(bitmap,cliprect,pant[1], 0, 0); - draw_sprites(machine,bitmap,cliprect, 0x8000, 0); + draw_sprites(screen->machine,bitmap,cliprect, 0x8000, 0); } - else if (screen==0) + else if (scrnum==0) { /* monitor 1 output */ tilemap_draw(bitmap,cliprect,pant[0], 0, 0); - draw_sprites(machine,bitmap,cliprect, 0x0000, 0); + draw_sprites(screen->machine,bitmap,cliprect, 0x0000, 0); } return 0; diff --git a/src/mame/video/gaiden.c b/src/mame/video/gaiden.c index b9e299c83c0..3091879c32b 100644 --- a/src/mame/video/gaiden.c +++ b/src/mame/video/gaiden.c @@ -565,7 +565,7 @@ VIDEO_UPDATE( gaiden ) tilemap_draw(bitmap, cliprect, foreground, 0, 2); tilemap_draw(bitmap, cliprect, text_layer, 0, 4); - gaiden_draw_sprites(machine, bitmap, cliprect); + gaiden_draw_sprites(screen->machine, bitmap, cliprect); return 0; } @@ -586,10 +586,10 @@ VIDEO_UPDATE( raiga ) tilemap_draw(tile_bitmap_fg, cliprect,text_layer, 0, 4); /* draw sprites into a 16-bit bitmap */ - raiga_draw_sprites(machine, tile_bitmap_bg, tile_bitmap_fg, sprite_bitmap, cliprect); + raiga_draw_sprites(screen->machine, tile_bitmap_bg, tile_bitmap_fg, sprite_bitmap, cliprect); /* mix & blend the tilemaps and sprites into a 32-bit bitmap */ - blendbitmaps(machine, bitmap, tile_bitmap_bg, tile_bitmap_fg, sprite_bitmap, 0, 0, cliprect); + blendbitmaps(screen->machine, bitmap, tile_bitmap_bg, tile_bitmap_fg, sprite_bitmap, 0, 0, cliprect); return 0; } @@ -600,6 +600,6 @@ VIDEO_UPDATE( drgnbowl ) tilemap_draw(bitmap, cliprect, background, 0, 1); tilemap_draw(bitmap, cliprect, foreground, 0, 2); tilemap_draw(bitmap, cliprect, text_layer, 0, 4); - drgnbowl_draw_sprites(machine, bitmap, cliprect); + drgnbowl_draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/galaga.c b/src/mame/video/galaga.c index b0fcc009d3d..e97ed1051aa 100644 --- a/src/mame/video/galaga.c +++ b/src/mame/video/galaga.c @@ -583,9 +583,9 @@ static void draw_stars(running_machine *machine, bitmap_t *bitmap, const rectang VIDEO_UPDATE( galaga ) { - fillbitmap(bitmap,get_black_pen(machine),cliprect); - draw_stars(machine,bitmap,cliprect); - draw_sprites(machine,bitmap,cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); + draw_stars(screen->machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; } diff --git a/src/mame/video/galaxian.c b/src/mame/video/galaxian.c index 99d9d63617e..d055173d1b0 100644 --- a/src/mame/video/galaxian.c +++ b/src/mame/video/galaxian.c @@ -2147,12 +2147,12 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, UINT8 *spri VIDEO_UPDATE( galaxian ) { - draw_background(machine, bitmap); + draw_background(screen->machine, bitmap); if (galaxian_stars_on) { - draw_stars(machine, bitmap); + draw_stars(screen->machine, bitmap); } @@ -2161,15 +2161,15 @@ VIDEO_UPDATE( galaxian ) if (draw_bullets) { - draw_bullets_common(machine, bitmap); + draw_bullets_common(screen->machine, bitmap); } - draw_sprites(machine, bitmap, galaxian_spriteram, galaxian_spriteram_size); + draw_sprites(screen->machine, bitmap, galaxian_spriteram, galaxian_spriteram_size); if (spriteram2_present) { - draw_sprites(machine, bitmap, galaxian_spriteram2, galaxian_spriteram2_size); + draw_sprites(screen->machine, bitmap, galaxian_spriteram2, galaxian_spriteram2_size); } return 0; } @@ -2180,24 +2180,24 @@ VIDEO_UPDATE( dambustr ) int i, j; UINT8 color; - draw_background(machine, bitmap); + draw_background(screen->machine, bitmap); if (galaxian_stars_on) { - draw_stars(machine, bitmap); + draw_stars(screen->machine, bitmap); } /* save the background for drawing it again later, if background has priority over characters */ - copybitmap(dambustr_tmpbitmap, bitmap, 0, 0, 0, 0, &machine->screen[0].visarea); + copybitmap(dambustr_tmpbitmap, bitmap, 0, 0, 0, 0, &screen->machine->screen[0].visarea); tilemap_draw(bitmap, 0, bg_tilemap, 0, 0); if (draw_bullets) { - draw_bullets_common(machine, bitmap); + draw_bullets_common(screen->machine, bitmap); } - draw_sprites(machine, bitmap, galaxian_spriteram, galaxian_spriteram_size); + draw_sprites(screen->machine, bitmap, galaxian_spriteram, galaxian_spriteram_size); if (dambustr_bg_priority) { diff --git a/src/mame/video/galivan.c b/src/mame/video/galivan.c index 68a73397a8c..0e76299860c 100644 --- a/src/mame/video/galivan.c +++ b/src/mame/video/galivan.c @@ -399,9 +399,9 @@ VIDEO_UPDATE( galivan ) if (layers & 0x20) { tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); tilemap_draw(bitmap,cliprect,tx_tilemap,1,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); } else { - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); tilemap_draw(bitmap,cliprect,tx_tilemap,1,0); } @@ -420,7 +420,7 @@ VIDEO_UPDATE( ninjemak ) else tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; diff --git a/src/mame/video/galpani2.c b/src/mame/video/galpani2.c index 5161d6371ce..ef676eea0cf 100644 --- a/src/mame/video/galpani2.c +++ b/src/mame/video/galpani2.c @@ -200,6 +200,6 @@ if (input_code_pressed(KEYCODE_Z)) cliprect,0x4000 + 0); } - if (layers_ctrl & 0x8) kaneko16_draw_sprites(machine, bitmap, cliprect); + if (layers_ctrl & 0x8) kaneko16_draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/galpanic.c b/src/mame/video/galpanic.c index 6eddd060bb5..c3ba9f4a6bf 100644 --- a/src/mame/video/galpanic.c +++ b/src/mame/video/galpanic.c @@ -109,7 +109,7 @@ VIDEO_UPDATE( galpanic ) draw_fgbitmap(bitmap, cliprect); - pandora_update(machine,bitmap,cliprect); + pandora_update(screen->machine,bitmap,cliprect); return 0; } @@ -125,12 +125,12 @@ VIDEO_UPDATE( comad ) // if(galpanic_clear_sprites) { fillbitmap(sprites_bitmap,0,cliprect); - comad_draw_sprites(machine,bitmap,cliprect); + comad_draw_sprites(screen->machine,bitmap,cliprect); } // else // { // /* keep sprites on the bitmap without clearing them */ -// comad_draw_sprites(machine,sprites_bitmap,0); +// comad_draw_sprites(screen->machine,sprites_bitmap,0); // copybitmap_trans(bitmap,sprites_bitmap,0,0,0,0,cliprect,0); // } return 0; diff --git a/src/mame/video/galspnbl.c b/src/mame/video/galspnbl.c index 95959f50cdc..c6f9295e379 100644 --- a/src/mame/video/galspnbl.c +++ b/src/mame/video/galspnbl.c @@ -110,7 +110,7 @@ VIDEO_UPDATE( galspnbl ) draw_background(bitmap, cliprect); - draw_sprites(machine,bitmap,cliprect,0); + draw_sprites(screen->machine,bitmap,cliprect,0); for (offs = 0;offs < 0x1000/2;offs++) { @@ -125,7 +125,7 @@ VIDEO_UPDATE( galspnbl ) /* What is this? A priority/half transparency marker? */ if (!(attr & 0x0008)) { - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], code, color, 0,0, @@ -135,6 +135,6 @@ VIDEO_UPDATE( galspnbl ) } } - draw_sprites(machine,bitmap,cliprect,1); + draw_sprites(screen->machine,bitmap,cliprect,1); return 0; } diff --git a/src/mame/video/gameplan.c b/src/mame/video/gameplan.c index e2473dba64d..ee6d4ac8d2e 100644 --- a/src/mame/video/gameplan.c +++ b/src/mame/video/gameplan.c @@ -72,7 +72,7 @@ static void leprechn_get_pens(pen_t *pens) static VIDEO_UPDATE( gameplan ) { - gameplan_state *state = machine->driver_data; + gameplan_state *state = screen->machine->driver_data; pen_t pens[GAMEPLAN_NUM_PENS]; offs_t offs; @@ -92,7 +92,7 @@ static VIDEO_UPDATE( gameplan ) static VIDEO_UPDATE( leprechn ) { - gameplan_state *state = machine->driver_data; + gameplan_state *state = screen->machine->driver_data; pen_t pens[LEPRECHN_NUM_PENS]; offs_t offs; diff --git a/src/mame/video/gaplus.c b/src/mame/video/gaplus.c index 29a68ee2da8..0afda820a58 100644 --- a/src/mame/video/gaplus.c +++ b/src/mame/video/gaplus.c @@ -324,12 +324,12 @@ VIDEO_UPDATE( gaplus ) fillbitmap(bitmap, 0, cliprect); - starfield_render(machine, bitmap); + starfield_render(screen->machine, bitmap); /* draw the low priority characters */ tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); /* draw the high priority characters */ /* (I don't know if this feature is used by Gaplus, but it's shown in the schematics) */ diff --git a/src/mame/video/gauntlet.c b/src/mame/video/gauntlet.c index 3f6317502e9..645129fbed2 100644 --- a/src/mame/video/gauntlet.c +++ b/src/mame/video/gauntlet.c @@ -197,7 +197,7 @@ VIDEO_UPDATE( gauntlet ) tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); /* draw and merge the MO */ - mobitmap = atarimo_render(machine, 0, cliprect, &rectlist); + mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) { diff --git a/src/mame/video/gberet.c b/src/mame/video/gberet.c index b5467ec1bfd..02dfc5e19d4 100644 --- a/src/mame/video/gberet.c +++ b/src/mame/video/gberet.c @@ -172,7 +172,7 @@ VIDEO_UPDATE( gberet ) { tilemap_draw(bitmap, cliprect, bg_tilemap, TILEMAP_DRAW_OPAQUE | 0, 0); tilemap_draw(bitmap, cliprect, bg_tilemap, TILEMAP_DRAW_OPAQUE | 1, 0); - gberet_draw_sprites(machine, bitmap, cliprect); + gberet_draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; } @@ -225,7 +225,7 @@ VIDEO_UPDATE( gberetb ) { tilemap_draw(bitmap, cliprect, bg_tilemap, TILEMAP_DRAW_OPAQUE | 0, 0); tilemap_draw(bitmap, cliprect, bg_tilemap, TILEMAP_DRAW_OPAQUE | 1, 0); - gberetb_draw_sprites(machine, bitmap, cliprect); + gberetb_draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/gcpinbal.c b/src/mame/video/gcpinbal.c index 57ca3c4cc7e..d79c68312ed 100644 --- a/src/mame/video/gcpinbal.c +++ b/src/mame/video/gcpinbal.c @@ -341,7 +341,7 @@ VIDEO_UPDATE( gcpinbal ) tilemap_draw(bitmap,cliprect,gcpinbal_tilemap[layer[2]],0,4); - draw_sprites(machine, bitmap,cliprect,16); + draw_sprites(screen->machine, bitmap,cliprect,16); #if 0 { diff --git a/src/mame/video/genesis.c b/src/mame/video/genesis.c index 2c3d03035b2..8076deaa356 100644 --- a/src/mame/video/genesis.c +++ b/src/mame/video/genesis.c @@ -271,7 +271,7 @@ VIDEO_UPDATE( genesis ) VIDEO_UPDATE( segac2 ) { if (!display_enable) - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); else VIDEO_UPDATE_CALL(genesis); return 0; diff --git a/src/mame/video/gijoe.c b/src/mame/video/gijoe.c index 8f3fbeefc78..9f23f6a0894 100644 --- a/src/mame/video/gijoe.c +++ b/src/mame/video/gijoe.c @@ -143,14 +143,14 @@ VIDEO_UPDATE( gijoe ) sortlayers(layer, layer_pri); - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); fillbitmap(priority_bitmap, 0, cliprect); - K056832_tilemap_draw(machine, bitmap,cliprect, layer[0], 0, 1); - K056832_tilemap_draw(machine, bitmap,cliprect, layer[1], 0, 2); - K056832_tilemap_draw(machine, bitmap,cliprect, layer[2], 0, 4); - K056832_tilemap_draw(machine, bitmap,cliprect, layer[3], 0, 8); + K056832_tilemap_draw(screen->machine, bitmap,cliprect, layer[0], 0, 1); + K056832_tilemap_draw(screen->machine, bitmap,cliprect, layer[1], 0, 2); + K056832_tilemap_draw(screen->machine, bitmap,cliprect, layer[2], 0, 4); + K056832_tilemap_draw(screen->machine, bitmap,cliprect, layer[3], 0, 8); - K053247_sprites_draw(machine, bitmap, cliprect); + K053247_sprites_draw(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/ginganin.c b/src/mame/video/ginganin.c index 5a20f8c3462..c3b66b40aed 100644 --- a/src/mame/video/ginganin.c +++ b/src/mame/video/ginganin.c @@ -283,7 +283,7 @@ if (input_code_pressed(KEYCODE_Z)) else fillbitmap(bitmap,0,cliprect); if (layers_ctrl1 & 2) tilemap_draw(bitmap,cliprect, fg_tilemap, 0,0); - if (layers_ctrl1 & 8) draw_sprites(machine, bitmap,cliprect); + if (layers_ctrl1 & 8) draw_sprites(screen->machine, bitmap,cliprect); if (layers_ctrl1 & 4) tilemap_draw(bitmap,cliprect, tx_tilemap, 0,0); return 0; diff --git a/src/mame/video/gladiatr.c b/src/mame/video/gladiatr.c index 6a2f7151e3c..ba0f2289ba1 100644 --- a/src/mame/video/gladiatr.c +++ b/src/mame/video/gladiatr.c @@ -253,7 +253,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( ppking ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); /* the fg layer just selects the upper palette bank on underlying pixels */ { @@ -301,10 +301,10 @@ VIDEO_UPDATE( gladiatr ) tilemap_set_scrolly(fg_tilemap, 0, fg_scrolly); tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); } else - fillbitmap( bitmap, get_black_pen(machine), cliprect ); + fillbitmap( bitmap, get_black_pen(screen->machine), cliprect ); return 0; } diff --git a/src/mame/video/glass.c b/src/mame/video/glass.c index f2eaea5b484..9e006412f8d 100644 --- a/src/mame/video/glass.c +++ b/src/mame/video/glass.c @@ -202,10 +202,10 @@ VIDEO_UPDATE( glass ) tilemap_set_scrollx(pant[1], 0, glass_vregs[3]); /* draw layers + sprites */ - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); copybitmap(bitmap,screen_bitmap,0,0,0x18,0x24,cliprect); tilemap_draw(bitmap,cliprect,pant[1],0,0); tilemap_draw(bitmap,cliprect,pant[0],0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/gng.c b/src/mame/video/gng.c index d87fccfc7ad..e662893017f 100644 --- a/src/mame/video/gng.c +++ b/src/mame/video/gng.c @@ -148,7 +148,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( gng ) { tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); return 0; diff --git a/src/mame/video/goal92.c b/src/mame/video/goal92.c index 8c8b51fa264..c29e144e039 100644 --- a/src/mame/video/goal92.c +++ b/src/mame/video/goal92.c @@ -162,21 +162,21 @@ VIDEO_UPDATE( goal92 ) tilemap_set_scrolly(foreground_layer, 0, goal92_scrollram16[3] + 8); } - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); tilemap_draw(bitmap,cliprect,background_layer,0,0); - draw_sprites(machine,bitmap,cliprect,2); + draw_sprites(screen->machine,bitmap,cliprect,2); if(!(fg_bank & 0xff)) - draw_sprites(machine,bitmap,cliprect,1); + draw_sprites(screen->machine,bitmap,cliprect,1); tilemap_draw(bitmap,cliprect,foreground_layer,0,0); if(fg_bank & 0xff) - draw_sprites(machine,bitmap,cliprect,1); + draw_sprites(screen->machine,bitmap,cliprect,1); - draw_sprites(machine,bitmap,cliprect,0); - draw_sprites(machine,bitmap,cliprect,3); + draw_sprites(screen->machine,bitmap,cliprect,0); + draw_sprites(screen->machine,bitmap,cliprect,3); tilemap_draw(bitmap,cliprect,text_layer,0,0); return 0; } diff --git a/src/mame/video/goindol.c b/src/mame/video/goindol.c index 226de4a69c9..3053a00d07d 100644 --- a/src/mame/video/goindol.c +++ b/src/mame/video/goindol.c @@ -137,7 +137,7 @@ VIDEO_UPDATE( goindol ) tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect,1,spriteram); - draw_sprites(machine,bitmap,cliprect,0,spriteram_2); + draw_sprites(screen->machine,bitmap,cliprect,1,spriteram); + draw_sprites(screen->machine,bitmap,cliprect,0,spriteram_2); return 0; } diff --git a/src/mame/video/goldstar.c b/src/mame/video/goldstar.c index 2a0491d17ef..54c9f4bdcfe 100644 --- a/src/mame/video/goldstar.c +++ b/src/mame/video/goldstar.c @@ -66,7 +66,7 @@ VIDEO_UPDATE( goldstar ) sx = offs % 64; sy = offs / 64; - drawgfx(tmpbitmap4,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], videoram[offs] + ((colorram[offs] & 0xf0) << 4), colorram[offs] & 0x0f, 0,0, @@ -83,21 +83,21 @@ VIDEO_UPDATE( goldstar ) int sy = offs / 64; - drawgfx(tmpbitmap1,machine->gfx[1], + drawgfx(tmpbitmap1,screen->machine->gfx[1], goldstar_video1[offs], bgcolor, 0,0, sx*8,sy*32, 0,TRANSPARENCY_NONE,0); - drawgfx(tmpbitmap2,machine->gfx[1], + drawgfx(tmpbitmap2,screen->machine->gfx[1], goldstar_video2[offs], bgcolor, 0,0, sx*8,sy*32, 0,TRANSPARENCY_NONE,0); - drawgfx(tmpbitmap3,machine->gfx[1], + drawgfx(tmpbitmap3,screen->machine->gfx[1], goldstar_video3[offs], bgcolor, 0,0, diff --git a/src/mame/video/goodejan.c b/src/mame/video/goodejan.c index ed083b1aeb6..41b60c9d1a4 100644 --- a/src/mame/video/goodejan.c +++ b/src/mame/video/goodejan.c @@ -94,11 +94,11 @@ VIDEO_START( goodejan ) VIDEO_UPDATE( goodejan ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect, 2); - draw_sprites(machine, bitmap,cliprect, 1); - draw_sprites(machine, bitmap,cliprect, 0); + draw_sprites(screen->machine, bitmap,cliprect, 2); + draw_sprites(screen->machine, bitmap,cliprect, 1); + draw_sprites(screen->machine, bitmap,cliprect, 0); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect, 3); + draw_sprites(screen->machine, bitmap,cliprect, 3); return 0; } diff --git a/src/mame/video/gotcha.c b/src/mame/video/gotcha.c index 3d09148d036..c077cf71519 100644 --- a/src/mame/video/gotcha.c +++ b/src/mame/video/gotcha.c @@ -129,7 +129,6 @@ VIDEO_UPDATE( gotcha ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); - - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/gottlieb.c b/src/mame/video/gottlieb.c index 4fbccddcdc9..c2494d22d8c 100644 --- a/src/mame/video/gottlieb.c +++ b/src/mame/video/gottlieb.c @@ -207,7 +207,7 @@ VIDEO_UPDATE( gottlieb ) else fillbitmap(bitmap, 0, cliprect); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); if (background_priority) tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); diff --git a/src/mame/video/gotya.c b/src/mame/video/gotya.c index d44add146fd..5a8c6084969 100644 --- a/src/mame/video/gotya.c +++ b/src/mame/video/gotya.c @@ -185,7 +185,7 @@ VIDEO_UPDATE( gotya ) { tilemap_set_scrollx(bg_tilemap, 0, -(*gotya_scroll + (scroll_bit_8 * 256)) - 2 * 8); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); - draw_status(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); + draw_status(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/gradius3.c b/src/mame/video/gradius3.c index 0ca8fb7a8a2..5f1fbe6cdab 100644 --- a/src/mame/video/gradius3.c +++ b/src/mame/video/gradius3.c @@ -120,8 +120,8 @@ WRITE16_HANDLER( gradius3_gfxram_w ) VIDEO_UPDATE( gradius3 ) { /* TODO: this kludge enforces the char banks. For some reason, they don't work otherwise. */ - K052109_w(machine,0x1d80,0x10); - K052109_w(machine,0x1f00,0x32); + K052109_w(screen->machine,0x1d80,0x10); + K052109_w(screen->machine,0x1f00,0x32); if (dirtygfx) { @@ -134,7 +134,7 @@ VIDEO_UPDATE( gradius3 ) if (dirtychar[i]) { dirtychar[i] = 0; - decodechar(machine->gfx[0],i,(UINT8 *)gradius3_gfxram); + decodechar(screen->machine->gfx[0],i,(UINT8 *)gradius3_gfxram); } } diff --git a/src/mame/video/grchamp.c b/src/mame/video/grchamp.c index bad967ba25e..b68b74783c9 100644 --- a/src/mame/video/grchamp.c +++ b/src/mame/video/grchamp.c @@ -369,7 +369,7 @@ VIDEO_UPDATE( grchamp ) MAKE_RGB(RGB_MAX,RGB_MAX,RGB_MAX) }; - grchamp_state *state = machine->driver_data; + grchamp_state *state = screen->machine->driver_data; const UINT8 *amedata = memory_region(REGION_GFX5); const UINT8 *headdata = memory_region(REGION_GFX6); const UINT8 *pldata = memory_region(REGION_GFX7); @@ -412,7 +412,7 @@ VIDEO_UPDATE( grchamp ) UINT8 objdata[256]; /* draw the objects for this scanline */ - draw_objects(machine, state, y, objdata); + draw_objects(screen->machine, state, y, objdata); /* iterate over columns */ for (x = cliprect->min_x; x <= cliprect->max_x; x++) diff --git a/src/mame/video/gridlee.c b/src/mame/video/gridlee.c index d4b7465e47c..a989567c9bc 100644 --- a/src/mame/video/gridlee.c +++ b/src/mame/video/gridlee.c @@ -131,7 +131,7 @@ WRITE8_HANDLER( gridlee_palette_select_w ) VIDEO_UPDATE( gridlee ) { - const pen_t *pens = &machine->pens[palettebank_vis * 32]; + const pen_t *pens = &screen->machine->pens[palettebank_vis * 32]; int x, y, i; /* draw scanlines from the VRAM directly */ diff --git a/src/mame/video/groundfx.c b/src/mame/video/groundfx.c index 8ea020378aa..3f2e58167ec 100644 --- a/src/mame/video/groundfx.c +++ b/src/mame/video/groundfx.c @@ -224,8 +224,8 @@ VIDEO_UPDATE( groundfx ) UINT8 pivlayer[3]; UINT16 priority; - TC0100SCN_tilemap_update(machine); - TC0480SCP_tilemap_update(machine); + TC0100SCN_tilemap_update(screen->machine); + TC0480SCP_tilemap_update(screen->machine); priority = TC0480SCP_get_bg_priority(); @@ -242,8 +242,8 @@ VIDEO_UPDATE( groundfx ) fillbitmap(priority_bitmap,0,cliprect); fillbitmap(bitmap,0,cliprect); /* wrong color? */ - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,pivlayer[0],0,0); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,pivlayer[1],0,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,pivlayer[0],0,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,pivlayer[1],0,0); /* BIG HACK! @@ -261,21 +261,21 @@ VIDEO_UPDATE( groundfx ) it's contents the usual way. */ - if (TC0100SCN_long_r(machine,0x4090/4,0) || TC0480SCP_long_r(machine,0x20/4,0)==0x240866) { /* Anything in text layer - really stupid hack */ + if (TC0100SCN_long_r(screen->machine,0x4090/4,0) || TC0480SCP_long_r(screen->machine,0x20/4,0)==0x240866) { /* Anything in text layer - really stupid hack */ TC0480SCP_tilemap_draw(bitmap,cliprect,layer[1],0,2); TC0480SCP_tilemap_draw(bitmap,cliprect,layer[2],0,4); TC0480SCP_tilemap_draw(bitmap,cliprect,layer[3],0,8); // TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,pivlayer[2],0,0); - if (TC0480SCP_long_r(machine,0x20/4,0)!=0x240866) /* Stupid hack for start of race */ + if (TC0480SCP_long_r(screen->machine,0x20/4,0)!=0x240866) /* Stupid hack for start of race */ TC0480SCP_tilemap_draw(bitmap,&hack_cliprect,layer[0],0,0); - draw_sprites(machine,bitmap,cliprect,1,44,-574); + draw_sprites(screen->machine,bitmap,cliprect,1,44,-574); } else { TC0480SCP_tilemap_draw(bitmap,cliprect,layer[0],0,1); TC0480SCP_tilemap_draw(bitmap,cliprect,layer[1],0,2); TC0480SCP_tilemap_draw(bitmap,cliprect,layer[2],0,4); TC0480SCP_tilemap_draw(bitmap,cliprect,layer[3],0,8); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,pivlayer[2],0,0); - draw_sprites(machine,bitmap,cliprect,0,44,-574); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,pivlayer[2],0,0); + draw_sprites(screen->machine,bitmap,cliprect,0,44,-574); } TC0480SCP_tilemap_draw(bitmap,cliprect,layer[4],0,0); /* TC0480SCP text layer */ diff --git a/src/mame/video/gstriker.c b/src/mame/video/gstriker.c index c566b13ce3f..c81b0781656 100644 --- a/src/mame/video/gstriker.c +++ b/src/mame/video/gstriker.c @@ -535,17 +535,17 @@ WRITE16_HANDLER( gsx_videoram3_w ) VIDEO_UPDATE(gstriker) { - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); // Sandwitched screen/sprite0/score/sprite1. Surely wrong, probably // needs sprite orthogonality - MB60553_draw(machine, 0, bitmap,cliprect, 0); + MB60553_draw(screen->machine, 0, bitmap,cliprect, 0); - CG10103_draw(machine, 0, bitmap, cliprect, 0); + CG10103_draw(screen->machine, 0, bitmap, cliprect, 0); VS920A_draw(0, bitmap, cliprect, 0); - CG10103_draw(machine, 0, bitmap, cliprect, 1); + CG10103_draw(screen->machine, 0, bitmap, cliprect, 1); #if 0 popmessage("%04x %04x %04x %04x %04x %04x %04x %04x", diff --git a/src/mame/video/gsword.c b/src/mame/video/gsword.c index 040fa7523db..0911b959f05 100644 --- a/src/mame/video/gsword.c +++ b/src/mame/video/gsword.c @@ -210,6 +210,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( gsword ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/gticlub.c b/src/mame/video/gticlub.c index 1468a0b9f45..12e9a5358b9 100644 --- a/src/mame/video/gticlub.c +++ b/src/mame/video/gticlub.c @@ -965,7 +965,7 @@ static int debug_tex_palette = 0; VIDEO_UPDATE( gticlub ) { - K001604_tile_update(machine, 0); + K001604_tile_update(screen->machine, 0); K001604_draw_back_layer(0, bitmap, cliprect); K001005_draw(bitmap, cliprect); @@ -1025,7 +1025,7 @@ VIDEO_UPDATE( gticlub ) draw_7segment_led(bitmap, 3, 3, gticlub_led_reg0); draw_7segment_led(bitmap, 9, 3, gticlub_led_reg1); - //cpunum_set_input_line(machine, 2, SHARC_INPUT_FLAG1, ASSERT_LINE); + //cpunum_set_input_line(screen->machine, 2, SHARC_INPUT_FLAG1, ASSERT_LINE); cpuintrf_push_context(2); sharc_set_flag_input(1, ASSERT_LINE); cpuintrf_pop_context(); diff --git a/src/mame/video/gunbustr.c b/src/mame/video/gunbustr.c index da1a85bc029..3e4e1c6ae6b 100644 --- a/src/mame/video/gunbustr.c +++ b/src/mame/video/gunbustr.c @@ -221,7 +221,7 @@ VIDEO_UPDATE( gunbustr ) UINT16 priority; static const int primasks[4] = {0xfffc, 0xfff0, 0xff00, 0x0}; - TC0480SCP_tilemap_update(machine); + TC0480SCP_tilemap_update(screen->machine); priority = TC0480SCP_get_bg_priority(); layer[0] = (priority &0xf000) >> 12; /* tells us which bg layer is bottom */ @@ -241,14 +241,14 @@ VIDEO_UPDATE( gunbustr ) if (!input_code_pressed (KEYCODE_C)) TC0480SCP_tilemap_draw(bitmap,cliprect,layer[2],0,2); if (!input_code_pressed (KEYCODE_V)) TC0480SCP_tilemap_draw(bitmap,cliprect,layer[3],0,4); if (!input_code_pressed (KEYCODE_B)) TC0480SCP_tilemap_draw(bitmap,cliprect,layer[4],0,8); - if (!input_code_pressed (KEYCODE_N)) draw_sprites(machine,bitmap,cliprect,primasks,48,-116); + if (!input_code_pressed (KEYCODE_N)) draw_sprites(screen->machine,bitmap,cliprect,primasks,48,-116); #else TC0480SCP_tilemap_draw(bitmap,cliprect,layer[0],TILEMAP_DRAW_OPAQUE,0); TC0480SCP_tilemap_draw(bitmap,cliprect,layer[1],0,1); TC0480SCP_tilemap_draw(bitmap,cliprect,layer[2],0,2); TC0480SCP_tilemap_draw(bitmap,cliprect,layer[3],0,4); TC0480SCP_tilemap_draw(bitmap,cliprect,layer[4],0,8); /* text layer */ - draw_sprites(machine,bitmap,cliprect,primasks,48,-116); + draw_sprites(screen->machine,bitmap,cliprect,primasks,48,-116); #endif return 0; } diff --git a/src/mame/video/gunsmoke.c b/src/mame/video/gunsmoke.c index 3d6e0bdb355..a3db2253c27 100644 --- a/src/mame/video/gunsmoke.c +++ b/src/mame/video/gunsmoke.c @@ -188,9 +188,9 @@ VIDEO_UPDATE( gunsmoke ) if (bgon) tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); else - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); - if (objon) draw_sprites(machine, bitmap, cliprect); + if (objon) draw_sprites(screen->machine, bitmap, cliprect); if (chon) tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/gyruss.c b/src/mame/video/gyruss.c index d38b8fa2b60..f17d3fac874 100644 --- a/src/mame/video/gyruss.c +++ b/src/mame/video/gyruss.c @@ -156,14 +156,14 @@ static void draw_sprites(gfx_element **gfx, bitmap_t *bitmap, const rectangle *c VIDEO_UPDATE( gyruss ) { - if (cliprect->min_y == machine->screen[screen].visarea.min_y) + if (cliprect->min_y == screen->machine->screen[scrnum].visarea.min_y) { tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); tilemap_set_flip(ALL_TILEMAPS, (*gyruss_flipscreen & 0x01) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); } tilemap_draw(bitmap, cliprect, gyruss_tilemap, TILEMAP_DRAW_OPAQUE, 0); - draw_sprites(machine->gfx, bitmap, cliprect); + draw_sprites(screen->machine->gfx, bitmap, cliprect); tilemap_draw(bitmap, cliprect, gyruss_tilemap, 0, 0); return 0; diff --git a/src/mame/video/hanaawas.c b/src/mame/video/hanaawas.c index 4b9b43b4892..c7647517c69 100644 --- a/src/mame/video/hanaawas.c +++ b/src/mame/video/hanaawas.c @@ -107,6 +107,6 @@ VIDEO_START( hanaawas ) VIDEO_UPDATE( hanaawas ) { - tilemap_draw(bitmap, &machine->screen[0].visarea, bg_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/hcastle.c b/src/mame/video/hcastle.c index 3596c09f961..5ff8ba750fc 100644 --- a/src/mame/video/hcastle.c +++ b/src/mame/video/hcastle.c @@ -210,7 +210,7 @@ VIDEO_UPDATE( hcastle ) { static int old_pf1,old_pf2; - set_pens(machine->colortable); + set_pens(screen->machine->colortable); pf1_bankbase = 0x0000; pf2_bankbase = 0x4000 * ((gfx_bank & 2) >> 1); @@ -237,16 +237,16 @@ VIDEO_UPDATE( hcastle ) if ((gfx_bank & 0x04) == 0) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites( machine,bitmap,cliprect, buffered_spriteram, 0 ); - draw_sprites( machine,bitmap,cliprect, buffered_spriteram_2, 1 ); + draw_sprites(screen->machine,bitmap,cliprect, buffered_spriteram, 0 ); + draw_sprites(screen->machine,bitmap,cliprect, buffered_spriteram_2, 1 ); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); } else { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); - draw_sprites( machine,bitmap,cliprect, buffered_spriteram, 0 ); - draw_sprites( machine,bitmap,cliprect, buffered_spriteram_2, 1 ); + draw_sprites(screen->machine,bitmap,cliprect, buffered_spriteram, 0 ); + draw_sprites(screen->machine,bitmap,cliprect, buffered_spriteram_2, 1 ); } return 0; } diff --git a/src/mame/video/higemaru.c b/src/mame/video/higemaru.c index eddc9f1f474..26def452598 100644 --- a/src/mame/video/higemaru.c +++ b/src/mame/video/higemaru.c @@ -142,6 +142,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( higemaru ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c index d04d9300ac8..2f5d2eee2c1 100644 --- a/src/mame/video/hng64.c +++ b/src/mame/video/hng64.c @@ -1237,7 +1237,7 @@ static void hng64_drawtilemap1( bitmap_t *bitmap, const rectangle *cliprect ) VIDEO_UPDATE( hng64 ) { - fillbitmap(bitmap, get_black_pen(machine), 0); + fillbitmap(bitmap, get_black_pen(screen->machine), 0); // Debug // for (int iii = 0; iii < 0x0f; iii++) @@ -1264,16 +1264,16 @@ VIDEO_UPDATE( hng64 ) // (there are neato alpha effects on a real board, etc) hng64_drawtilemap2(bitmap,cliprect); hng64_drawtilemap1(bitmap,cliprect); - hng64_drawtilemap3(machine, bitmap,cliprect); // Draw the ground last... + hng64_drawtilemap3(screen->machine, bitmap,cliprect); // Draw the ground last... // !!! This tilemap has the same flags as the 'previous' three, but they're not used in fatfurwa !!! // (in other words, we should make a similar hng64_drawtilemap0() function for this tilemap) tilemap_draw(bitmap,cliprect,hng64_tilemap0,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); // 3d really shouldn't be last, but you don't see some cool stuff right now if it's put before sprites :)... - draw3d(machine, bitmap, cliprect); + draw3d(screen->machine, bitmap, cliprect); /* hack to enable 2nd cpu when key is pressed */ // if ( input_code_pressed_once(KEYCODE_L) ) @@ -1285,7 +1285,7 @@ VIDEO_UPDATE( hng64 ) /* AJG */ // if(input_code_pressed(KEYCODE_D)) - transition_control(machine, bitmap) ; + transition_control(screen->machine, bitmap) ; // mame_printf_debug("FRAME DONE %d\n", frameCount) ; frameCount++ ; diff --git a/src/mame/video/holeland.c b/src/mame/video/holeland.c index 23460b8bdb4..5920fa3f62f 100644 --- a/src/mame/video/holeland.c +++ b/src/mame/video/holeland.c @@ -183,7 +183,7 @@ VIDEO_UPDATE( holeland ) { /*tilemap_mark_all_tiles_dirty(bg_tilemap); */ tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1,0); - holeland_draw_sprites(machine, bitmap,cliprect); + holeland_draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0,0); return 0; } @@ -191,6 +191,6 @@ VIDEO_UPDATE( holeland ) VIDEO_UPDATE( crzrally ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - crzrally_draw_sprites(machine, bitmap,cliprect); + crzrally_draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/homedata.c b/src/mame/video/homedata.c index 2f1e01c8e18..4823a51022e 100644 --- a/src/mame/video/homedata.c +++ b/src/mame/video/homedata.c @@ -682,7 +682,7 @@ VIDEO_UPDATE( mrokumei ) /* blank screen */ if (homedata_vreg[0x3] == 0xc1 && homedata_vreg[0x4] == 0xc0 && homedata_vreg[0x5] == 0xff) { - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); return 0; } @@ -744,7 +744,7 @@ VIDEO_UPDATE( reikaids ) } - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); pri = (blitter_bank & 0x70) >> 4; for (i = 0;i < 4;i++) @@ -790,7 +790,7 @@ VIDEO_UPDATE( reikaids ) } - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); pri = (blitter_bank & 0x70) >> 4; for (i = 0;i < 4;i++) @@ -807,7 +807,7 @@ VIDEO_UPDATE( pteacher ) /* blank screen */ if (homedata_vreg[0x3] == 0xc1 && homedata_vreg[0x4] == 0xc0 && homedata_vreg[0x5] == 0xff) { - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); return 0; } diff --git a/src/mame/video/homerun.c b/src/mame/video/homerun.c index 8c0a2d4739e..60d35af822a 100644 --- a/src/mame/video/homerun.c +++ b/src/mame/video/homerun.c @@ -98,7 +98,7 @@ VIDEO_UPDATE(homerun) myclip.max_y/=2; homerun_gfx_ctrl=homerun_gc_up; tilemap_draw(bitmap,&myclip,homerun_tilemap,0,0); - draw_sprites(machine, bitmap,&myclip); + draw_sprites(screen->machine, bitmap,&myclip); /* lower part */ @@ -106,7 +106,7 @@ VIDEO_UPDATE(homerun) myclip.max_y*=2; homerun_gfx_ctrl=homerun_gc_down; tilemap_draw(bitmap,&myclip,homerun_tilemap,0,0); - draw_sprites(machine, bitmap,&myclip); + draw_sprites(screen->machine, bitmap,&myclip); homerun_gc_down=homerun_gc_up; return 0; diff --git a/src/mame/video/hyperspt.c b/src/mame/video/hyperspt.c index 7451112c451..5b4e4e2b6ef 100644 --- a/src/mame/video/hyperspt.c +++ b/src/mame/video/hyperspt.c @@ -184,7 +184,7 @@ VIDEO_UPDATE( hyperspt ) } tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/hyprduel.c b/src/mame/video/hyprduel.c index 3bd9f9f05ee..70dee3cad5c 100644 --- a/src/mame/video/hyprduel.c +++ b/src/mame/video/hyprduel.c @@ -632,8 +632,8 @@ VIDEO_UPDATE( hyprduel ) } } - hyprduel_sprite_xoffs = hyprduel_videoregs[0x06/2] - machine->screen[0].width / 2; - hyprduel_sprite_yoffs = hyprduel_videoregs[0x04/2] - machine->screen[0].height / 2; + hyprduel_sprite_xoffs = hyprduel_videoregs[0x06/2] - screen->machine->screen[0].width / 2; + hyprduel_sprite_yoffs = hyprduel_videoregs[0x04/2] - screen->machine->screen[0].height / 2; /* The background color is selected by a register */ fillbitmap(priority_bitmap,0,cliprect); @@ -678,6 +678,6 @@ if (input_code_pressed(KEYCODE_Z)) draw_layers(bitmap,cliprect,pri,layers_ctrl); if (layers_ctrl & 0x08) - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/ikki.c b/src/mame/video/ikki.c index 026bfad2b41..5a1b0f15509 100644 --- a/src/mame/video/ikki.c +++ b/src/mame/video/ikki.c @@ -177,7 +177,7 @@ VIDEO_UPDATE( ikki ) bank = (color & 0xe0) << 3; color = ((color & 0x1f)<<0) | ((color & 0x80) >> 2); - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], videoram[offs*2+1] + bank, color, ikki_flipscreen,ikki_flipscreen, @@ -185,7 +185,7 @@ VIDEO_UPDATE( ikki ) cliprect,TRANSPARENCY_NONE,0); } - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); /* mask sprites */ @@ -213,7 +213,7 @@ VIDEO_UPDATE( ikki ) bank = (color & 0xe0) << 3; color = ((color & 0x1f)<<0) | ((color & 0x80) >> 2); - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], videoram[offs*2+1] + bank, color, ikki_flipscreen,ikki_flipscreen, diff --git a/src/mame/video/inufuku.c b/src/mame/video/inufuku.c index a41f9d1b53e..01c34b8f2d3 100644 --- a/src/mame/video/inufuku.c +++ b/src/mame/video/inufuku.c @@ -240,7 +240,7 @@ VIDEO_UPDATE( inufuku ) { int i; - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); fillbitmap(priority_bitmap, 0, NULL); if (inufuku_bg_raster) { @@ -258,6 +258,6 @@ VIDEO_UPDATE( inufuku ) tilemap_set_scrolly(inufuku_text_tilemap, 0, inufuku_text_scrolly); tilemap_draw(bitmap, cliprect, inufuku_text_tilemap, 0, 4); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/irobot.c b/src/mame/video/irobot.c index 8168588978f..b5093faa330 100644 --- a/src/mame/video/irobot.c +++ b/src/mame/video/irobot.c @@ -362,7 +362,7 @@ VIDEO_UPDATE( irobot ) int code = videoram[offs] & 0x3f; int color = ((videoram[offs] & 0xc0) >> 6) | (irobot_alphamap >> 3); - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], code, color, 0,0, 8*x,8*y, diff --git a/src/mame/video/ironhors.c b/src/mame/video/ironhors.c index b477ba3b6c6..e4c1adfedb8 100644 --- a/src/mame/video/ironhors.c +++ b/src/mame/video/ironhors.c @@ -249,6 +249,6 @@ VIDEO_UPDATE( ironhors ) tilemap_set_scrollx(bg_tilemap, row, ironhors_scroll[row]); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/itech8.c b/src/mame/video/itech8.c index 236b556f63f..08eef3d0bf4 100644 --- a/src/mame/video/itech8.c +++ b/src/mame/video/itech8.c @@ -582,7 +582,7 @@ VIDEO_UPDATE( itech8_2layer ) /* if we're blanked, just fill with black */ if (tms_state.blanked) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); return 0; } @@ -618,7 +618,7 @@ VIDEO_UPDATE( itech8_2page ) /* if we're blanked, just fill with black */ if (tms_state.blanked) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); return 0; } @@ -649,7 +649,7 @@ VIDEO_UPDATE( itech8_2page_large ) /* if we're blanked, just fill with black */ if (tms_state.blanked) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); return 0; } diff --git a/src/mame/video/jack.c b/src/mame/video/jack.c index 56b73d8f7a5..bef8614a7f5 100644 --- a/src/mame/video/jack.c +++ b/src/mame/video/jack.c @@ -93,7 +93,7 @@ static void jack_draw_sprites(running_machine *machine, bitmap_t *bitmap, const VIDEO_UPDATE( jack ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - jack_draw_sprites(machine, bitmap, cliprect); + jack_draw_sprites(screen->machine, bitmap, cliprect); return 0; } @@ -174,6 +174,6 @@ static void joinem_draw_sprites(running_machine *machine, bitmap_t *bitmap, cons VIDEO_UPDATE( joinem ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - joinem_draw_sprites(machine, bitmap, cliprect); + joinem_draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/jackal.c b/src/mame/video/jackal.c index fbccc663b0f..e0d36615471 100644 --- a/src/mame/video/jackal.c +++ b/src/mame/video/jackal.c @@ -228,8 +228,8 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( jackal ) { - set_pens(machine->colortable); + set_pens(screen->machine->colortable); draw_background(bitmap, cliprect); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/jailbrek.c b/src/mame/video/jailbrek.c index 0512b4566e3..eec9ca40418 100644 --- a/src/mame/video/jailbrek.c +++ b/src/mame/video/jailbrek.c @@ -120,6 +120,6 @@ VIDEO_UPDATE( jailbrek ) } tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/jcross.c b/src/mame/video/jcross.c index 44398a862c4..4f9233684d0 100644 --- a/src/mame/video/jcross.c +++ b/src/mame/video/jcross.c @@ -181,14 +181,14 @@ VIDEO_UPDATE( jcross ) if( scroll_attributes & 8 ) sprite_scrolly += 256; if( scroll_attributes & 0x10 ) bg_scrolly += 256; - update_palette(machine, 1); + update_palette(screen->machine, 1); tilemap_set_scrollx( bg_tilemap, 0, bg_scrollx ); tilemap_set_scrolly( bg_tilemap, 0, bg_scrolly ); - tilemap_draw( bitmap,cliprect,bg_tilemap,0 ,0); - draw_sprites( machine, bitmap,cliprect, sprite_scrollx+23, sprite_scrolly+1 ); - tilemap_draw( bitmap,cliprect,tx_tilemap,0 ,0); - draw_status( machine, bitmap,cliprect ); + tilemap_draw(bitmap,cliprect,bg_tilemap,0 ,0); + draw_sprites(screen->machine, bitmap,cliprect, sprite_scrollx+23, sprite_scrolly+1 ); + tilemap_draw(bitmap,cliprect,tx_tilemap,0 ,0); + draw_status(screen->machine, bitmap,cliprect ); return 0; } diff --git a/src/mame/video/jedi.c b/src/mame/video/jedi.c index 3147b549e54..617f6dfffd1 100644 --- a/src/mame/video/jedi.c +++ b/src/mame/video/jedi.c @@ -329,7 +329,7 @@ static void draw_sprites(jedi_state *state, bitmap_t *bitmap, const rectangle *c static VIDEO_UPDATE( jedi ) { - jedi_state *state = machine->driver_data; + jedi_state *state = screen->machine->driver_data; /* if no video, clear it all to black */ if (*state->video_off & 0x01) diff --git a/src/mame/video/kan_panb.c b/src/mame/video/kan_panb.c index 90fc9b3bd87..b06e29b7a9d 100644 --- a/src/mame/video/kan_panb.c +++ b/src/mame/video/kan_panb.c @@ -12,7 +12,7 @@ VIDEO_UPDATE( honeydol ) /* not standard snowbros video */ - fillbitmap(bitmap,0xf0,&machine->screen[0].visarea); + fillbitmap(bitmap,0xf0,cliprect); for (offs = 0x0000/2;offs < 0x2000/2;offs += 8) { @@ -43,12 +43,12 @@ VIDEO_UPDATE( honeydol ) sy = y; } - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], tile, tilecolour, flipx, flipy, sx,sy, - &machine->screen[0].visarea,TRANSPARENCY_PEN,0); + cliprect,TRANSPARENCY_PEN,0); /* second list interleaved with first (4bpp) ??? */ dx = spriteram16[offs+4] & 0xff; @@ -78,12 +78,12 @@ VIDEO_UPDATE( honeydol ) tilecolour = (tilecolour&0x03f0) >> 4; tilecolour ^=0x3f; // unusual, but correct.. - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], tile, tilecolour, flipx, flipy, sx,sy, - &machine->screen[0].visarea,TRANSPARENCY_PEN,0); + cliprect,TRANSPARENCY_PEN,0); } return 0; } @@ -98,7 +98,7 @@ VIDEO_UPDATE( twinadv ) /* not standard snowbros video */ - fillbitmap(bitmap,0xf0,&machine->screen[0].visarea); + fillbitmap(bitmap,0xf0,cliprect); for (offs = 0x0000/2;offs < 0x2000/2;offs += 8) { @@ -133,12 +133,12 @@ VIDEO_UPDATE( twinadv ) tilecolour = (tilecolour&0x00f0) >> 4; tilecolour ^=0xf; // unusual, but correct.. - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], tile, tilecolour, flipx, flipy, sx,sy, - &machine->screen[0].visarea,TRANSPARENCY_PEN,0); + cliprect,TRANSPARENCY_PEN,0); } return 0; } @@ -148,7 +148,7 @@ VIDEO_UPDATE( wintbob ) { int offs; - fillbitmap(bitmap,get_black_pen(machine),&machine->screen[0].visarea); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); for (offs = 0;offs < spriteram_size/2;offs += 8) { @@ -175,12 +175,12 @@ VIDEO_UPDATE( wintbob ) if ((xpos > -16) && (ypos > 0) && (xpos < 256) && (ypos < 240) && (disbl !=2)) { - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], tilen, colr, flipx, flipy, xpos,ypos, - &machine->screen[0].visarea,TRANSPARENCY_PEN,0); + cliprect,TRANSPARENCY_PEN,0); } } return 0; @@ -216,11 +216,11 @@ VIDEO_UPDATE( snowbro3 ) /* This clears & redraws the entire screen each pass */ - fillbitmap(bitmap,get_black_pen(machine),&machine->screen[0].visarea); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); for (offs = 0;offs < spriteram_size/2;offs += 8) { - gfx_element *gfx = machine->gfx[0]; + gfx_element *gfx = screen->machine->gfx[0]; int dx = spriteram16[offs+4] & 0xff; int dy = spriteram16[offs+5] & 0xff; int tilecolour = spriteram16[offs+3]; @@ -260,7 +260,7 @@ VIDEO_UPDATE( snowbro3 ) if (offs < 0x800) /* i guess this is the right way */ { - gfx = machine->gfx[1]; + gfx = screen->machine->gfx[1]; tilecolour = 0x10; } @@ -269,7 +269,7 @@ VIDEO_UPDATE( snowbro3 ) (tilecolour & 0xf0) >> 4, flipx, flipy, sx,sy, - &machine->screen[0].visarea,TRANSPARENCY_PEN,0); + cliprect,TRANSPARENCY_PEN,0); } return 0; } diff --git a/src/mame/video/kaneko16.c b/src/mame/video/kaneko16.c index c0e0d7c7dac..502405cacd1 100644 --- a/src/mame/video/kaneko16.c +++ b/src/mame/video/kaneko16.c @@ -951,13 +951,13 @@ static VIDEO_UPDATE( common ) fillbitmap(priority_bitmap,0,cliprect); - kaneko16_prepare_first_tilemap_chip(machine, bitmap, cliprect); - kaneko16_prepare_second_tilemap_chip(machine, bitmap, cliprect); + kaneko16_prepare_first_tilemap_chip(screen->machine, bitmap, cliprect); + kaneko16_prepare_second_tilemap_chip(screen->machine, bitmap, cliprect); for ( i = 0; i < 8; i++ ) { - kaneko16_render_first_tilemap_chip(machine,bitmap,cliprect,i); - kaneko16_render_second_tilemap_chip(machine,bitmap,cliprect,i); + kaneko16_render_first_tilemap_chip(screen->machine,bitmap,cliprect,i); + kaneko16_render_second_tilemap_chip(screen->machine,bitmap,cliprect,i); } return 0; @@ -966,13 +966,13 @@ static VIDEO_UPDATE( common ) VIDEO_UPDATE(berlwall) { // berlwall uses a 15bpp bitmap as a bg, not a solid fill - kaneko16_render_15bpp_bitmap(machine,bitmap,cliprect); + kaneko16_render_15bpp_bitmap(screen->machine,bitmap,cliprect); // if the display is disabled, do nothing? if (!kaneko16_disp_enable) return 0; VIDEO_UPDATE_CALL(common); - kaneko16_render_sprites(machine,bitmap,cliprect); + kaneko16_render_sprites(screen->machine,bitmap,cliprect); return 0; } @@ -980,19 +980,19 @@ VIDEO_UPDATE(berlwall) VIDEO_UPDATE( kaneko16 ) { - kaneko16_fill_bitmap(machine,bitmap,cliprect); + kaneko16_fill_bitmap(screen->machine,bitmap,cliprect); // if the display is disabled, do nothing? if (!kaneko16_disp_enable) return 0; VIDEO_UPDATE_CALL(common); - kaneko16_render_sprites(machine,bitmap,cliprect); + kaneko16_render_sprites(screen->machine,bitmap,cliprect); return 0; } VIDEO_UPDATE( galsnew ) { -// kaneko16_fill_bitmap(machine,bitmap,cliprect); +// kaneko16_fill_bitmap(screen->machine,bitmap,cliprect); int y,x; int count; @@ -1033,14 +1033,14 @@ VIDEO_UPDATE( galsnew ) VIDEO_UPDATE_CALL(common); - kaneko16_render_sprites(machine,bitmap,cliprect); + kaneko16_render_sprites(screen->machine,bitmap,cliprect); return 0; } VIDEO_UPDATE( sandscrp ) { - kaneko16_fill_bitmap(machine,bitmap,cliprect); + kaneko16_fill_bitmap(screen->machine,bitmap,cliprect); // if the display is disabled, do nothing? if (!kaneko16_disp_enable) return 0; @@ -1048,7 +1048,7 @@ VIDEO_UPDATE( sandscrp ) VIDEO_UPDATE_CALL(common); // copy sprite bitmap to screen - pandora_update(machine,bitmap,cliprect); + pandora_update(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/karnov.c b/src/mame/video/karnov.c index 4f7d4c2b9b6..fb83256e418 100644 --- a/src/mame/video/karnov.c +++ b/src/mame/video/karnov.c @@ -200,8 +200,8 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( karnov ) { - draw_background(machine,bitmap,cliprect); - draw_sprites(machine,bitmap,cliprect); + draw_background(screen->machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,fix_tilemap,0,0); return 0; } diff --git a/src/mame/video/kchamp.c b/src/mame/video/kchamp.c index 4ec9cfe50ad..9c582dd7888 100644 --- a/src/mame/video/kchamp.c +++ b/src/mame/video/kchamp.c @@ -125,13 +125,13 @@ static void kchampvs_draw_sprites(running_machine *machine, bitmap_t *bitmap, co VIDEO_UPDATE( kchamp ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - kchamp_draw_sprites(machine, bitmap, cliprect); + kchamp_draw_sprites(screen->machine, bitmap, cliprect); return 0; } VIDEO_UPDATE( kchampvs ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - kchampvs_draw_sprites(machine, bitmap, cliprect); + kchampvs_draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/kickgoal.c b/src/mame/video/kickgoal.c index 8ecc7caabd7..996a4671c1d 100644 --- a/src/mame/video/kickgoal.c +++ b/src/mame/video/kickgoal.c @@ -127,7 +127,7 @@ VIDEO_UPDATE( kickgoal ) tilemap_draw(bitmap,cliprect,kickgoal_bg2tm,0,0); tilemap_draw(bitmap,cliprect,kickgoal_bgtm,0,0); - kickgoal_draw_sprites(machine,bitmap,cliprect); + kickgoal_draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,kickgoal_fgtm,0,0); @@ -250,7 +250,7 @@ VIDEO_UPDATE( actionhw ) tilemap_draw(bitmap,cliprect,kickgoal_bg2tm,0,0); tilemap_draw(bitmap,cliprect,kickgoal_bgtm,0,0); - actionhw_draw_sprites(machine,bitmap,cliprect); + actionhw_draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,kickgoal_fgtm,0,0); return 0; diff --git a/src/mame/video/kingobox.c b/src/mame/video/kingobox.c index d654b40baf5..b3e5631b3d2 100644 --- a/src/mame/video/kingobox.c +++ b/src/mame/video/kingobox.c @@ -249,7 +249,7 @@ VIDEO_UPDATE( kingofb ) { tilemap_set_scrolly(bg_tilemap, 0, -(*kingofb_scroll_y)); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - kingofb_draw_sprites(machine, bitmap, cliprect); + kingofb_draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); return 0; } @@ -309,7 +309,7 @@ VIDEO_UPDATE( ringking ) { tilemap_set_scrolly(bg_tilemap, 0, -(*kingofb_scroll_y)); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - ringking_draw_sprites(machine, bitmap, cliprect); + ringking_draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/klax.c b/src/mame/video/klax.c index 2cb450b30c5..1bf6e24bafe 100644 --- a/src/mame/video/klax.c +++ b/src/mame/video/klax.c @@ -109,7 +109,7 @@ VIDEO_UPDATE( klax ) tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); /* draw and merge the MO */ - mobitmap = atarimo_render(machine, 0, cliprect, &rectlist); + mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) { diff --git a/src/mame/video/kncljoe.c b/src/mame/video/kncljoe.c index 23ab8e636f9..6655d2ad78f 100644 --- a/src/mame/video/kncljoe.c +++ b/src/mame/video/kncljoe.c @@ -237,6 +237,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( kncljoe ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/konamigx.c b/src/mame/video/konamigx.c index e8b380aa9eb..a25ddbb9b10 100644 --- a/src/mame/video/konamigx.c +++ b/src/mame/video/konamigx.c @@ -402,9 +402,9 @@ VIDEO_UPDATE(konamigx) if (dirty) K056832_MarkAllTilemapsDirty(); if (gx_rozenable) - konamigx_mixer(machine, bitmap, cliprect, 0, 0, gx_psac_tilemap, GXSUB_8BPP, 0); + konamigx_mixer(screen->machine, bitmap, cliprect, 0, 0, gx_psac_tilemap, GXSUB_8BPP, 0); else - konamigx_mixer(machine, bitmap, cliprect, 0, 0, 0, 0, 0); + konamigx_mixer(screen->machine, bitmap, cliprect, 0, 0, 0, 0, 0); return 0; } diff --git a/src/mame/video/kopunch.c b/src/mame/video/kopunch.c index f1ebada7a43..9d1c19a25ac 100644 --- a/src/mame/video/kopunch.c +++ b/src/mame/video/kopunch.c @@ -103,8 +103,8 @@ VIDEO_UPDATE( kopunch ) { int offs; - tilemap_draw(bitmap, &machine->screen[0].visarea, bg_tilemap, 0, 0); - //tilemap_draw(bitmap, &machine->screen[0].visarea, fg_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); + //tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); for (offs = 1023;offs >= 0;offs--) { @@ -113,12 +113,12 @@ VIDEO_UPDATE( kopunch ) sx = offs % 16; sy = offs / 16; - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], (kopunch_videoram2[offs] & 0x7f) + 128 * gfxbank, 0, 0,gfxflip, 8*(sx+8)+scroll[0],8*(8+(gfxflip ? 15-sy : sy))+scroll[1], - &machine->screen[0].visarea,TRANSPARENCY_PEN,0); + cliprect,TRANSPARENCY_PEN,0); } return 0; } diff --git a/src/mame/video/ksayakyu.c b/src/mame/video/ksayakyu.c index c3905db8045..2da94f2ae78 100644 --- a/src/mame/video/ksayakyu.c +++ b/src/mame/video/ksayakyu.c @@ -110,7 +110,7 @@ VIDEO_UPDATE(ksayakyu) fillbitmap(bitmap,0,cliprect); if(video_ctrl&1) tilemap_draw(bitmap,cliprect,ksayakyu_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,ksayakyu_textmap, 0,0); return 0; } diff --git a/src/mame/video/kyugo.c b/src/mame/video/kyugo.c index fcd0aa8c041..779d991d45a 100644 --- a/src/mame/video/kyugo.c +++ b/src/mame/video/kyugo.c @@ -226,7 +226,7 @@ VIDEO_UPDATE( kyugo ) tilemap_set_scrolly(bg_tilemap,0,scroll_y); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/labyrunr.c b/src/mame/video/labyrunr.c index ae550752a62..71574e59776 100644 --- a/src/mame/video/labyrunr.c +++ b/src/mame/video/labyrunr.c @@ -173,10 +173,10 @@ VIDEO_UPDATE( labyrunr ) { rectangle finalclip0, finalclip1; - set_pens(machine->colortable); + set_pens(screen->machine->colortable); fillbitmap(priority_bitmap,0,cliprect); - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); if(~K007121_ctrlram[0][3] & 0x20) { @@ -201,7 +201,7 @@ VIDEO_UPDATE( labyrunr ) } tilemap_draw(bitmap,&finalclip0,layer0,TILEMAP_DRAW_OPAQUE,0); - K007121_sprites_draw(0,bitmap,machine->gfx,machine->colortable,cliprect,spriteram,(K007121_ctrlram[0][6]&0x30)*2,40,0,(K007121_ctrlram[0][3] & 0x40) >> 5); + K007121_sprites_draw(0,bitmap,screen->machine->gfx,screen->machine->colortable,cliprect,spriteram,(K007121_ctrlram[0][6]&0x30)*2,40,0,(K007121_ctrlram[0][3] & 0x40) >> 5); /* we ignore the transparency because layer1 is drawn only at the top of the screen also covering sprites */ tilemap_draw(bitmap,&finalclip1,layer1,TILEMAP_DRAW_OPAQUE,0); } @@ -269,7 +269,7 @@ VIDEO_UPDATE( labyrunr ) tilemap_draw(bitmap,&finalclip1,layer1,0,1); if(use_clip3[1]) tilemap_draw(bitmap,&finalclip3,layer1,0,1); - K007121_sprites_draw(0,bitmap,machine->gfx,machine->colortable,cliprect,spriteram,(K007121_ctrlram[0][6]&0x30)*2,40,0,(K007121_ctrlram[0][3] & 0x40) >> 5); + K007121_sprites_draw(0,bitmap,screen->machine->gfx,screen->machine->colortable,cliprect,spriteram,(K007121_ctrlram[0][6]&0x30)*2,40,0,(K007121_ctrlram[0][3] & 0x40) >> 5); } return 0; } diff --git a/src/mame/video/ladybug.c b/src/mame/video/ladybug.c index 573022ebbe4..ffce878ebb0 100644 --- a/src/mame/video/ladybug.c +++ b/src/mame/video/ladybug.c @@ -377,7 +377,7 @@ VIDEO_UPDATE( ladybug ) } tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } @@ -415,9 +415,9 @@ VIDEO_UPDATE( sraider ) redclash_draw_stars(bitmap,cliprect,0x60,1,0x00,0xd8); // draw the gridlines - colortable_palette_set_color(machine->colortable, 0x40, MAKE_RGB(sraider_grid_color & 0x40 ? 0xff : 0, - sraider_grid_color & 0x20 ? 0xff : 0, - sraider_grid_color & 0x10 ? 0xff : 0)); + colortable_palette_set_color(screen->machine->colortable, 0x40, MAKE_RGB(sraider_grid_color & 0x40 ? 0xff : 0, + sraider_grid_color & 0x20 ? 0xff : 0, + sraider_grid_color & 0x10 ? 0xff : 0)); tilemap_draw(bitmap, cliprect, grid_tilemap, 0, flip_screen_get()); for (i = 0; i < 0x100; i++) @@ -439,7 +439,7 @@ VIDEO_UPDATE( sraider ) tilemap_draw(bitmap, cliprect, bg_tilemap, 0, flip_screen_get()); // now the sprites - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/ladyfrog.c b/src/mame/video/ladyfrog.c index c284ade658d..421d4dc39f9 100644 --- a/src/mame/video/ladyfrog.c +++ b/src/mame/video/ladyfrog.c @@ -149,7 +149,7 @@ VIDEO_START( ladyfrog ) VIDEO_UPDATE( ladyfrog ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/lasso.c b/src/mame/video/lasso.c index 5bb2382ea92..118766f63a8 100644 --- a/src/mame/video/lasso.c +++ b/src/mame/video/lasso.c @@ -382,23 +382,23 @@ static void draw_lasso(bitmap_t *bitmap, const rectangle *cliprect) VIDEO_UPDATE( lasso ) { - palette_set_color(machine, 0, get_color(*lasso_back_color)); + palette_set_color(screen->machine, 0, get_color(*lasso_back_color)); fillbitmap(bitmap, 0, cliprect); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); draw_lasso(bitmap, cliprect); - draw_sprites(machine, bitmap, cliprect, 0); + draw_sprites(screen->machine, bitmap, cliprect, 0); return 0; } VIDEO_UPDATE( chameleo ) { - palette_set_color(machine, 0, get_color(*lasso_back_color)); + palette_set_color(screen->machine, 0, get_color(*lasso_back_color)); fillbitmap(bitmap, 0, cliprect); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect, 0); + draw_sprites(screen->machine, bitmap, cliprect, 0); return 0; } @@ -406,8 +406,8 @@ VIDEO_UPDATE( chameleo ) VIDEO_UPDATE( wwjgtin ) { - colortable_palette_set_color(machine->colortable, 0, get_color(*lasso_back_color)); - wwjgtin_set_last_four_colors(machine->colortable); + colortable_palette_set_color(screen->machine->colortable, 0, get_color(*lasso_back_color)); + wwjgtin_set_last_four_colors(screen->machine->colortable); tilemap_set_scrollx(track_tilemap, 0, wwjgtin_track_scroll[0] + wwjgtin_track_scroll[1]*256); tilemap_set_scrolly(track_tilemap, 0, wwjgtin_track_scroll[2] + wwjgtin_track_scroll[3]*256); @@ -415,9 +415,9 @@ VIDEO_UPDATE( wwjgtin ) if (wwjgtin_track_enable) tilemap_draw(bitmap, cliprect, track_tilemap, 0, 0); else - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); - draw_sprites(machine, bitmap, cliprect, 1); // reverse order + draw_sprites(screen->machine, bitmap, cliprect, 1); // reverse order tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; @@ -427,7 +427,7 @@ VIDEO_UPDATE( wwjgtin ) VIDEO_UPDATE( pinbo ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect, 0); + draw_sprites(screen->machine, bitmap, cliprect, 0); return 0; } diff --git a/src/mame/video/lastduel.c b/src/mame/video/lastduel.c index 8f20c7513c1..039301afca2 100644 --- a/src/mame/video/lastduel.c +++ b/src/mame/video/lastduel.c @@ -236,9 +236,9 @@ VIDEO_UPDATE( lastduel ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,TILEMAP_DRAW_LAYER1,0); - draw_sprites(machine,bitmap,cliprect,0); + draw_sprites(screen->machine,bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,fg_tilemap,TILEMAP_DRAW_LAYER0,0); - draw_sprites(machine,bitmap,cliprect,1); + draw_sprites(screen->machine,bitmap,cliprect,1); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; } diff --git a/src/mame/video/lazercmd.c b/src/mame/video/lazercmd.c index 85e3968921c..9b44ce9481c 100644 --- a/src/mame/video/lazercmd.c +++ b/src/mame/video/lazercmd.c @@ -57,7 +57,7 @@ VIDEO_UPDATE( lazercmd ) { int i,x,y; - int video_inverted = input_port_2_r(machine,0) & 0x20; + int video_inverted = readinputport(2) & 0x20; /* The first row of characters are invisible */ for (i = 0; i < (VERT_RES - 1) * HORZ_RES; i++) @@ -70,16 +70,16 @@ VIDEO_UPDATE( lazercmd ) sx *= HORZ_CHR; sy *= VERT_CHR; - drawgfx(bitmap, machine->gfx[0], + drawgfx(bitmap, screen->machine->gfx[0], videoram[i], video_inverted ? 1 : 0, 0,0, sx,sy, - &machine->screen[0].visarea,TRANSPARENCY_NONE,0); + cliprect,TRANSPARENCY_NONE,0); } x = marker_x - 1; /* normal video lags marker by 1 pixel */ y = vert_scale(marker_y) - VERT_CHR; /* first line used as scratch pad */ - plot_pattern(machine, bitmap,x,y); + plot_pattern(screen->machine, bitmap,x,y); return 0; } diff --git a/src/mame/video/legionna.c b/src/mame/video/legionna.c index a87db3c1b91..a7ee777be8a 100644 --- a/src/mame/video/legionna.c +++ b/src/mame/video/legionna.c @@ -357,7 +357,7 @@ if (input_code_pressed_once (KEYCODE_Z)) // if ((legionna_enable&1)!=1) - fillbitmap(bitmap,get_black_pen(machine),cliprect); /* wrong color? */ + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); /* wrong color? */ #if LAYER_DB if (dislayer[2]==0) @@ -369,14 +369,14 @@ if (input_code_pressed_once (KEYCODE_Z)) #endif tilemap_draw(bitmap,cliprect,midground_layer,0,0); - draw_sprites(machine, bitmap,cliprect,3); + draw_sprites(screen->machine, bitmap,cliprect,3); #if LAYER_DB if (dislayer[0]==0) #endif tilemap_draw(bitmap,cliprect,background_layer,0,0); - draw_sprites(machine,bitmap,cliprect,2); - draw_sprites(machine,bitmap,cliprect,1); - draw_sprites(machine,bitmap,cliprect,0); + draw_sprites(screen->machine,bitmap,cliprect,2); + draw_sprites(screen->machine,bitmap,cliprect,1); + draw_sprites(screen->machine,bitmap,cliprect,0); #if LAYER_DB if (dislayer[4]==0) @@ -398,15 +398,15 @@ VIDEO_UPDATE( godzilla ) tilemap_set_scrollx( foreground_layer, 0, legionna_scrollram16[4] ); tilemap_set_scrolly( foreground_layer, 0, legionna_scrollram16[5] ); - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); tilemap_draw(bitmap,cliprect,background_layer,0,0); - draw_sprites(machine,bitmap,cliprect,2); + draw_sprites(screen->machine,bitmap,cliprect,2); tilemap_draw(bitmap,cliprect,midground_layer,0,0); - draw_sprites(machine,bitmap,cliprect,1); + draw_sprites(screen->machine,bitmap,cliprect,1); tilemap_draw(bitmap,cliprect,foreground_layer,0,0); - draw_sprites(machine,bitmap,cliprect,0); - draw_sprites(machine,bitmap,cliprect,3); + draw_sprites(screen->machine,bitmap,cliprect,0); + draw_sprites(screen->machine,bitmap,cliprect,3); tilemap_draw(bitmap,cliprect,text_layer,0,0); return 0; @@ -424,23 +424,23 @@ VIDEO_UPDATE( sdgndmrb ) tilemap_set_scrollx( text_layer, 0, legionna_scrollram16[6] ); tilemap_set_scrolly( text_layer, 0, legionna_scrollram16[7] ); - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); if(!(sdgndmrb_pri_n & 1)) tilemap_draw(bitmap,cliprect,background_layer,0,0); - draw_sprites(machine,bitmap,cliprect,2); + draw_sprites(screen->machine,bitmap,cliprect,2); if(!(sdgndmrb_pri_n & 2)) tilemap_draw(bitmap,cliprect,midground_layer,0,0); - draw_sprites(machine,bitmap,cliprect,1); + draw_sprites(screen->machine,bitmap,cliprect,1); if(!(sdgndmrb_pri_n & 4)) tilemap_draw(bitmap,cliprect,foreground_layer,0,0); - draw_sprites(machine,bitmap,cliprect,0); + draw_sprites(screen->machine,bitmap,cliprect,0); - draw_sprites(machine,bitmap,cliprect,3); + draw_sprites(screen->machine,bitmap,cliprect,3); if(!(sdgndmrb_pri_n & 8)) tilemap_draw(bitmap,cliprect,text_layer,0,0); diff --git a/src/mame/video/leland.c b/src/mame/video/leland.c index ea5f493d75a..1cf965b82ac 100644 --- a/src/mame/video/leland.c +++ b/src/mame/video/leland.c @@ -449,7 +449,7 @@ static VIDEO_UPDATE( leland ) } /* set a timer to go off at the top of the frame */ - if (cliprect->max_y == machine->screen[screen].visarea.max_y) + if (cliprect->max_y == screen->machine->screen[scrnum].visarea.max_y) timer_set(video_screen_get_time_until_pos(0, 0, 0), NULL, 0, dac_reset); return 0; @@ -525,7 +525,7 @@ static VIDEO_UPDATE( ataxx ) } /* set a timer to go off at the top of the frame */ - if (cliprect->max_y == machine->screen[screen].visarea.max_y) + if (cliprect->max_y == screen->machine->screen[scrnum].visarea.max_y) timer_set(video_screen_get_time_until_pos(0, 0, 0), NULL, 0, dac_reset); return 0; diff --git a/src/mame/video/lemmings.c b/src/mame/video/lemmings.c index a218f7c1b93..07ded3d931e 100644 --- a/src/mame/video/lemmings.c +++ b/src/mame/video/lemmings.c @@ -171,14 +171,14 @@ VIDEO_UPDATE( lemmings ) /* Decode any characters that have changed in vram */ for (i=0; i<2048; i++) { if (vram_dirty[i]) { - decodechar(machine->gfx[2],i,vram_buffer); + decodechar(screen->machine->gfx[2],i,vram_buffer); tilemap_mark_tile_dirty(vram_tilemap,i); vram_dirty[i]=0; } } - fillbitmap(bitmap,get_black_pen(machine),cliprect); - draw_sprites(machine,bitmap,cliprect,sprite_triple_buffer_1,1,0x0000); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); + draw_sprites(screen->machine,bitmap,cliprect,sprite_triple_buffer_1,1,0x0000); /* Pixel layer can be windowed in hardware (two player mode) */ if ((lemmings_control_data[6]&2)==0) { @@ -191,9 +191,9 @@ VIDEO_UPDATE( lemmings ) rect.min_x=160; copyscrollbitmap_trans(bitmap,bitmap0,1,&x1,1,&y,&rect,0x100); } - draw_sprites(machine,bitmap,cliprect,sprite_triple_buffer_0,0,0x0000); - draw_sprites(machine,bitmap,cliprect,sprite_triple_buffer_1,1,0x2000); + draw_sprites(screen->machine,bitmap,cliprect,sprite_triple_buffer_0,0,0x0000); + draw_sprites(screen->machine,bitmap,cliprect,sprite_triple_buffer_1,1,0x2000); tilemap_draw(bitmap,cliprect,vram_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect,sprite_triple_buffer_0,0,0x2000); + draw_sprites(screen->machine,bitmap,cliprect,sprite_triple_buffer_0,0,0x2000); return 0; } diff --git a/src/mame/video/lethal.c b/src/mame/video/lethal.c index d94c2b15e39..627751d4226 100644 --- a/src/mame/video/lethal.c +++ b/src/mame/video/lethal.c @@ -120,14 +120,14 @@ VIDEO_UPDATE(lethalen) fillbitmap(bitmap, 7168, cliprect); fillbitmap(priority_bitmap, 0, cliprect); - K056832_tilemap_draw(machine, bitmap, cliprect, 3, 0, 1); - K056832_tilemap_draw(machine, bitmap, cliprect, 2, 0, 2); - K056832_tilemap_draw(machine, bitmap, cliprect, 1, 0, 4); + K056832_tilemap_draw(screen->machine, bitmap, cliprect, 3, 0, 1); + K056832_tilemap_draw(screen->machine, bitmap, cliprect, 2, 0, 2); + K056832_tilemap_draw(screen->machine, bitmap, cliprect, 1, 0, 4); - K053245_sprites_draw_lethal(machine,0, bitmap, cliprect); + K053245_sprites_draw_lethal(screen->machine,0, bitmap, cliprect); // force "A" layer over top of everything - K056832_tilemap_draw(machine, bitmap, cliprect, 0, 0, 0); + K056832_tilemap_draw(screen->machine, bitmap, cliprect, 0, 0, 0); #if 0 diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c index f0fc9458bfd..277be39fc6a 100644 --- a/src/mame/video/liberate.c +++ b/src/mame/video/liberate.c @@ -370,7 +370,7 @@ VIDEO_UPDATE( prosoccr ) fillbitmap(bitmap,32,cliprect); else tilemap_draw(bitmap,cliprect,background_tilemap,0,0); - boomrang_draw_sprites(machine,bitmap,cliprect,0); + boomrang_draw_sprites(screen->machine,bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,fix_tilemap,0,0); return 0; } @@ -381,7 +381,7 @@ VIDEO_UPDATE( prosport ) fillbitmap(bitmap,0,cliprect); - prosport_draw_sprites(machine,bitmap,cliprect); + prosport_draw_sprites(screen->machine,bitmap,cliprect); for (offs = 0;offs < 0x400;offs++) { tile=videoram[offs+0x400]+((videoram[offs]&0x3)<<8); @@ -394,7 +394,7 @@ VIDEO_UPDATE( prosport ) my = (offs) % 32; mx = (offs) / 32; - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], tile,1,0,0,248-8*mx,8*my, cliprect,TRANSPARENCY_PEN,0); } @@ -411,10 +411,10 @@ VIDEO_UPDATE( boomrang ) else tilemap_draw(bitmap,cliprect,background_tilemap,TILEMAP_DRAW_LAYER1,0); - boomrang_draw_sprites(machine,bitmap,cliprect,8); + boomrang_draw_sprites(screen->machine,bitmap,cliprect,8); if (!background_disable) tilemap_draw(bitmap,cliprect,background_tilemap,TILEMAP_DRAW_LAYER0,0); - boomrang_draw_sprites(machine,bitmap,cliprect,0); + boomrang_draw_sprites(screen->machine,bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,fix_tilemap,0,0); return 0; } @@ -429,7 +429,7 @@ VIDEO_UPDATE( liberate ) else tilemap_draw(bitmap,cliprect,background_tilemap,0,0); - liberate_draw_sprites(machine,bitmap,cliprect); + liberate_draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,fix_tilemap,0,0); return 0; } diff --git a/src/mame/video/liberatr.c b/src/mame/video/liberatr.c index 29274636c91..3e396d513e2 100644 --- a/src/mame/video/liberatr.c +++ b/src/mame/video/liberatr.c @@ -371,7 +371,7 @@ VIDEO_UPDATE( liberatr ) liberatr_draw_planet(bitmap, pens); - liberatr_draw_bitmap(machine, bitmap, pens); + liberatr_draw_bitmap(screen->machine, bitmap, pens); return 0; } diff --git a/src/mame/video/lkage.c b/src/mame/video/lkage.c index 5748ecaf87b..e6923278bae 100644 --- a/src/mame/video/lkage.c +++ b/src/mame/video/lkage.c @@ -205,6 +205,6 @@ VIDEO_UPDATE( lkage ) { tilemap_draw( bitmap,cliprect,tx_tilemap,TILEMAP_DRAW_OPAQUE,0); } - draw_sprites(machine, bitmap,cliprect ); + draw_sprites(screen->machine, bitmap,cliprect ); return 0; } diff --git a/src/mame/video/lockon.c b/src/mame/video/lockon.c index 405392b383e..e9fc52abba5 100644 --- a/src/mame/video/lockon.c +++ b/src/mame/video/lockon.c @@ -958,7 +958,7 @@ VIDEO_UPDATE( lockon ) /* If screen output is disabled, fill with black */ if ( !BIT(lockon_ctrl_reg, 7) ) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); return 0; } diff --git a/src/mame/video/lordgun.c b/src/mame/video/lordgun.c index 1f265953762..2831bb12247 100644 --- a/src/mame/video/lordgun.c +++ b/src/mame/video/lordgun.c @@ -277,7 +277,7 @@ if (input_code_pressed(KEYCODE_Z)) if (lordgun_whitescreen) { - fillbitmap( bitmap, get_white_pen(machine), cliprect ); + fillbitmap( bitmap, get_white_pen(screen->machine), cliprect ); return 0; } @@ -299,7 +299,7 @@ if (input_code_pressed(KEYCODE_Z)) if (layers_ctrl & 4) tilemap_draw(bitmap, cliprect, tilemap_2, 0, 0); if (layers_ctrl & 1) tilemap_draw(bitmap, cliprect, tilemap_0, 0, 0); if (layers_ctrl & 2) tilemap_draw(bitmap, cliprect, tilemap_1, 0, 0); - if (layers_ctrl & 16) draw_sprites(machine, bitmap, cliprect); + if (layers_ctrl & 16) draw_sprites(screen->machine, bitmap, cliprect); if (layers_ctrl & 8) tilemap_draw(bitmap, cliprect, tilemap_3, 0, 0); return 0; diff --git a/src/mame/video/lsasquad.c b/src/mame/video/lsasquad.c index e554b183dc6..c490bdc2a32 100644 --- a/src/mame/video/lsasquad.c +++ b/src/mame/video/lsasquad.c @@ -203,10 +203,10 @@ VIDEO_UPDATE( lsasquad ) { fillbitmap(bitmap,511,cliprect); - draw_layer(machine,bitmap,cliprect,lsasquad_scrollram + 0x000); - draw_layer(machine,bitmap,cliprect,lsasquad_scrollram + 0x080); - draw_sprites(machine,bitmap,cliprect); - draw_layer(machine,bitmap,cliprect,lsasquad_scrollram + 0x100); + draw_layer(screen->machine,bitmap,cliprect,lsasquad_scrollram + 0x000); + draw_layer(screen->machine,bitmap,cliprect,lsasquad_scrollram + 0x080); + draw_sprites(screen->machine,bitmap,cliprect); + draw_layer(screen->machine,bitmap,cliprect,lsasquad_scrollram + 0x100); return 0; } @@ -214,8 +214,8 @@ VIDEO_UPDATE( lsasquad ) VIDEO_UPDATE( daikaiju ) { fillbitmap(bitmap,511,cliprect); - drawbg(machine,bitmap,cliprect,0); // bottom - draw_sprites(machine,bitmap,cliprect); - drawbg(machine,bitmap,cliprect,1); // top = pallete $d ? + drawbg(screen->machine,bitmap,cliprect,0); // bottom + draw_sprites(screen->machine,bitmap,cliprect); + drawbg(screen->machine,bitmap,cliprect,1); // top = pallete $d ? return 0; } diff --git a/src/mame/video/lwings.c b/src/mame/video/lwings.c index 1f952f59496..9f7b76f830a 100644 --- a/src/mame/video/lwings.c +++ b/src/mame/video/lwings.c @@ -272,7 +272,7 @@ static void trojan_draw_sprites(running_machine *machine, bitmap_t *bitmap, cons VIDEO_UPDATE( lwings ) { tilemap_draw(bitmap,cliprect,bg1_tilemap,0,0); - lwings_draw_sprites(machine,bitmap,cliprect); + lwings_draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); return 0; } @@ -281,7 +281,7 @@ VIDEO_UPDATE( trojan ) { tilemap_draw(bitmap,cliprect,bg2_tilemap,0,0); tilemap_draw(bitmap,cliprect,bg1_tilemap,TILEMAP_DRAW_LAYER1,0); - trojan_draw_sprites(machine,bitmap,cliprect); + trojan_draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,bg1_tilemap,TILEMAP_DRAW_LAYER0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); return 0; diff --git a/src/mame/video/m10.c b/src/mame/video/m10.c index 8f922ed5153..9836373c6d6 100644 --- a/src/mame/video/m10.c +++ b/src/mame/video/m10.c @@ -132,7 +132,7 @@ VIDEO_START( m15 ) ***************************************************************************/ VIDEO_UPDATE( m10 ) { - m10_state *state = machine->driver_data; + m10_state *state = screen->machine->driver_data; int offs; static const int color[4]= { 3, 3, 5, 5 }; static const int xpos[4] = { 4*8, 26*8, 7*8, 6*8}; @@ -172,7 +172,7 @@ VIDEO_UPDATE( m10 ) ***************************************************************************/ VIDEO_UPDATE( m15 ) { - m10_state *state = machine->driver_data; + m10_state *state = screen->machine->driver_data; int offs; for (offs = videoram_size - 1;offs >= 0;offs--) diff --git a/src/mame/video/m107.c b/src/mame/video/m107.c index d6414433ead..d5ed573bc02 100644 --- a/src/mame/video/m107.c +++ b/src/mame/video/m107.c @@ -314,7 +314,7 @@ WRITE16_HANDLER( m107_spritebuffer_w ) VIDEO_UPDATE( m107 ) { m107_update_scroll_positions(); - m107_screenrefresh(machine, bitmap, cliprect); + m107_screenrefresh(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/m52.c b/src/mame/video/m52.c index ff2eda23055..c14204bdca7 100644 --- a/src/mame/video/m52.c +++ b/src/mame/video/m52.c @@ -365,13 +365,13 @@ VIDEO_UPDATE( m52 ) if (!(bgcontrol & 0x20)) { if (!(bgcontrol & 0x10)) - draw_background(machine, bitmap, cliprect, bg2xpos, bg2ypos, 2); /* distant mountains */ + draw_background(screen->machine, bitmap, cliprect, bg2xpos, bg2ypos, 2); /* distant mountains */ if (!(bgcontrol & 0x02)) - draw_background(machine, bitmap, cliprect, bg1xpos, bg1ypos, 3); /* hills */ + draw_background(screen->machine, bitmap, cliprect, bg1xpos, bg1ypos, 3); /* hills */ if (!(bgcontrol & 0x04)) - draw_background(machine, bitmap, cliprect, bg1xpos, bg1ypos, 4); /* cityscape */ + draw_background(screen->machine, bitmap, cliprect, bg1xpos, bg1ypos, 4); /* cityscape */ } tilemap_set_flip(bg_tilemap, flip_screen_get() ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); @@ -418,10 +418,10 @@ VIDEO_UPDATE( m52 ) clip = *cliprect; #endif - drawgfx(bitmap, machine->gfx[1], + drawgfx(bitmap, screen->machine->gfx[1], code, color, flipx, flipy, sx, sy, &clip, TRANSPARENCY_PENS, - colortable_get_transpen_mask(machine->colortable, machine->gfx[1], color, 512+32)); + colortable_get_transpen_mask(screen->machine->colortable, screen->machine->gfx[1], color, 512+32)); } return 0; } diff --git a/src/mame/video/m57.c b/src/mame/video/m57.c index 5f6f62c07fa..0b71fd7582f 100644 --- a/src/mame/video/m57.c +++ b/src/mame/video/m57.c @@ -232,7 +232,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( m57 ) { - draw_background(machine, bitmap, cliprect); - draw_sprites(machine, bitmap, cliprect); + draw_background(screen->machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/m58.c b/src/mame/video/m58.c index d4e19b68822..08d7d905e9e 100644 --- a/src/mame/video/m58.c +++ b/src/mame/video/m58.c @@ -307,7 +307,7 @@ VIDEO_UPDATE( yard ) tilemap_set_scrolly(bg_tilemap, 0, *yard_scroll_y_low); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); - draw_panel(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); + draw_panel(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/m62.c b/src/mame/video/m62.c index 6e18d464050..90b33c18c7d 100644 --- a/src/mame/video/m62.c +++ b/src/mame/video/m62.c @@ -475,7 +475,7 @@ VIDEO_UPDATE( kungfum ) tilemap_set_scrollx( m62_background, i, m62_background_hscroll ); } tilemap_draw( bitmap, cliprect, m62_background, 0, 0 ); - draw_sprites( machine, bitmap, cliprect, 0x1f, 0x00, 0x00 ); + draw_sprites( screen->machine, bitmap, cliprect, 0x1f, 0x00, 0x00 ); tilemap_draw( bitmap, cliprect, m62_background, 1, 0 ); return 0; } @@ -515,9 +515,9 @@ VIDEO_UPDATE( ldrun ) tilemap_set_scrolly( m62_background, 0, m62_background_vscroll ); tilemap_draw( bitmap, cliprect, m62_background, 0, 0 ); - draw_sprites( machine, bitmap, cliprect, 0x0f, 0x10, 0x00 ); + draw_sprites( screen->machine, bitmap, cliprect, 0x0f, 0x10, 0x00 ); tilemap_draw( bitmap, cliprect, m62_background, 1, 0 ); - draw_sprites( machine, bitmap, cliprect, 0x0f, 0x10, 0x10 ); + draw_sprites( screen->machine, bitmap, cliprect, 0x0f, 0x10, 0x10 ); return 0; } @@ -595,9 +595,9 @@ VIDEO_UPDATE( battroad ) tilemap_set_transparent_pen( m62_foreground, 0 ); tilemap_draw( bitmap, cliprect, m62_background, 0, 0 ); - draw_sprites( machine, bitmap, cliprect, 0x0f, 0x10, 0x00 ); + draw_sprites( screen->machine, bitmap, cliprect, 0x0f, 0x10, 0x00 ); tilemap_draw( bitmap, cliprect, m62_background, 1, 0 ); - draw_sprites( machine, bitmap, cliprect, 0x0f, 0x10, 0x10 ); + draw_sprites( screen->machine, bitmap, cliprect, 0x0f, 0x10, 0x10 ); tilemap_draw( bitmap, cliprect, m62_foreground, 0, 0 ); return 0; } @@ -625,7 +625,7 @@ VIDEO_UPDATE( ldrun4 ) tilemap_set_scrollx( m62_background, 0, m62_background_hscroll ); tilemap_draw( bitmap, cliprect, m62_background, 0, 0 ); - draw_sprites( machine, bitmap, cliprect, 0x1f, 0x00, 0x00 ); + draw_sprites( screen->machine, bitmap, cliprect, 0x1f, 0x00, 0x00 ); return 0; } @@ -669,7 +669,7 @@ VIDEO_UPDATE( lotlot ) tilemap_draw( bitmap, cliprect, m62_background, 0, 0 ); tilemap_draw( bitmap, cliprect, m62_foreground, 0, 0 ); - draw_sprites( machine, bitmap, cliprect, 0x1f, 0x00, 0x00 ); + draw_sprites( screen->machine, bitmap, cliprect, 0x1f, 0x00, 0x00 ); return 0; } @@ -726,7 +726,7 @@ VIDEO_UPDATE( kidniki ) tilemap_set_transparent_pen( m62_foreground, 0 ); tilemap_draw( bitmap, cliprect, m62_background, TILEMAP_DRAW_LAYER1, 0 ); - draw_sprites( machine, bitmap, cliprect, 0x1f, 0x00, 0x00 ); + draw_sprites( screen->machine, bitmap, cliprect, 0x1f, 0x00, 0x00 ); tilemap_draw( bitmap, cliprect, m62_background, TILEMAP_DRAW_LAYER0, 0 ); tilemap_draw( bitmap, cliprect, m62_foreground, 0, 0 ); return 0; @@ -786,7 +786,7 @@ VIDEO_UPDATE( spelunkr ) tilemap_set_transparent_pen( m62_foreground, 0 ); tilemap_draw( bitmap, cliprect, m62_background, 0, 0 ); - draw_sprites( machine, bitmap, cliprect, 0x1f, 0x00, 0x00 ); + draw_sprites( screen->machine, bitmap, cliprect, 0x1f, 0x00, 0x00 ); tilemap_draw( bitmap, cliprect, m62_foreground, 0, 0 ); return 0; } @@ -828,7 +828,7 @@ VIDEO_UPDATE( spelunk2 ) tilemap_set_transparent_pen( m62_foreground, 0 ); tilemap_draw( bitmap, cliprect, m62_background, 0, 0 ); - draw_sprites( machine, bitmap, cliprect, 0x1f, 0x00, 0x00 ); + draw_sprites( screen->machine, bitmap, cliprect, 0x1f, 0x00, 0x00 ); tilemap_draw( bitmap, cliprect, m62_foreground, 0, 0 ); return 0; } @@ -874,7 +874,7 @@ VIDEO_UPDATE( youjyudn ) tilemap_set_transparent_pen( m62_foreground, 0 ); tilemap_draw( bitmap, cliprect, m62_background, 0, 0 ); - draw_sprites( machine, bitmap, cliprect, 0x1f, 0x00, 0x00 ); + draw_sprites( screen->machine, bitmap, cliprect, 0x1f, 0x00, 0x00 ); tilemap_draw( bitmap, cliprect, m62_background, 1, 0 ); tilemap_draw( bitmap, cliprect, m62_foreground, 0, 0 ); return 0; @@ -917,7 +917,7 @@ VIDEO_UPDATE( horizon ) tilemap_set_scrollx( m62_background, i, horizon_scrollram[ i << 1 ] | ( horizon_scrollram[ ( i << 1 ) | 1 ] << 8 ) ); } tilemap_draw( bitmap, cliprect, m62_background, 0, 0 ); - draw_sprites( machine, bitmap, cliprect, 0x1f, 0x00, 0x00 ); + draw_sprites( screen->machine, bitmap, cliprect, 0x1f, 0x00, 0x00 ); tilemap_draw( bitmap, cliprect, m62_background, 1, 0 ); return 0; } diff --git a/src/mame/video/m72.c b/src/mame/video/m72.c index b347842fb8e..0eecb9efc66 100644 --- a/src/mame/video/m72.c +++ b/src/mame/video/m72.c @@ -508,7 +508,7 @@ VIDEO_UPDATE( m72 ) { if (video_off) { - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); return 0; } @@ -520,7 +520,7 @@ VIDEO_UPDATE( m72 ) tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1,0); tilemap_draw(bitmap,cliprect,fg_tilemap,TILEMAP_DRAW_LAYER1,0); - m72_draw_sprites(machine, bitmap,cliprect); + m72_draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,TILEMAP_DRAW_LAYER0,0); return 0; @@ -533,7 +533,7 @@ VIDEO_UPDATE( majtitle ) if (video_off) { - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); return 0; } @@ -556,8 +556,8 @@ VIDEO_UPDATE( majtitle ) tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1,0); tilemap_draw(bitmap,cliprect,fg_tilemap,TILEMAP_DRAW_LAYER1,0); - majtitle_draw_sprites(machine, bitmap,cliprect); - m72_draw_sprites(machine, bitmap,cliprect); + majtitle_draw_sprites(screen->machine, bitmap,cliprect); + m72_draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,TILEMAP_DRAW_LAYER0,0); return 0; diff --git a/src/mame/video/m90.c b/src/mame/video/m90.c index e9f540cc575..27b55e8eb87 100644 --- a/src/mame/video/m90.c +++ b/src/mame/video/m90.c @@ -256,6 +256,6 @@ VIDEO_UPDATE( m90 ) tilemap_draw(bitmap,cliprect,pf1_layer,1,1); } - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/m92.c b/src/mame/video/m92.c index 463ced1bec0..1aa71407a2a 100644 --- a/src/mame/video/m92.c +++ b/src/mame/video/m92.c @@ -460,7 +460,7 @@ static void m92_screenrefresh(running_machine *machine, bitmap_t *bitmap,const r VIDEO_UPDATE( m92 ) { m92_update_scroll_positions(); - m92_screenrefresh(machine, bitmap, cliprect); + m92_screenrefresh(screen->machine, bitmap, cliprect); /* Flipscreen appears hardwired to the dipswitch - strange */ if (readinputportbytag("DIPS21") & 0x100) diff --git a/src/mame/video/macrossp.c b/src/mame/video/macrossp.c index d36d5efe6cd..ab97a2a3a73 100644 --- a/src/mame/video/macrossp.c +++ b/src/mame/video/macrossp.c @@ -370,7 +370,7 @@ VIDEO_UPDATE(macrossp) int layers[3],layerpri[3]; - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); layers[0] = 0; layerpri[0] = (macrossp_scra_videoregs[0] & 0x0000c000) >> 14; @@ -382,12 +382,12 @@ VIDEO_UPDATE(macrossp) sortlayers(layers, layerpri); draw_layer(bitmap,cliprect,layers[0]); - draw_sprites(machine,bitmap,cliprect,0); + draw_sprites(screen->machine,bitmap,cliprect,0); draw_layer(bitmap,cliprect,layers[1]); - draw_sprites(machine,bitmap,cliprect,1); + draw_sprites(screen->machine,bitmap,cliprect,1); draw_layer(bitmap,cliprect,layers[2]); - draw_sprites(machine,bitmap,cliprect,2); - draw_sprites(machine,bitmap,cliprect,3); + draw_sprites(screen->machine,bitmap,cliprect,2); + draw_sprites(screen->machine,bitmap,cliprect,3); tilemap_draw(bitmap,cliprect,macrossp_text_tilemap,0,0); #if 0 diff --git a/src/mame/video/madalien.c b/src/mame/video/madalien.c index 05e27b86b81..2110452c7d9 100644 --- a/src/mame/video/madalien.c +++ b/src/mame/video/madalien.c @@ -266,7 +266,7 @@ static VIDEO_UPDATE( madalien ) fillbitmap(bitmap, 0, cliprect); draw_edges(bitmap, cliprect, flip, scroll_mode); - draw_foreground(machine, bitmap, cliprect, flip); + draw_foreground(screen->machine, bitmap, cliprect, flip); /* highlight section A (outside of tunnels) */ diff --git a/src/mame/video/madmotor.c b/src/mame/video/madmotor.c index ed066830c1f..fae7756509a 100644 --- a/src/mame/video/madmotor.c +++ b/src/mame/video/madmotor.c @@ -291,7 +291,7 @@ VIDEO_UPDATE( madmotor ) else tilemap_draw(bitmap,cliprect,madmotor_pf3a_tilemap,0,0); tilemap_draw(bitmap,cliprect,madmotor_pf2_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect,0x00,0x00); + draw_sprites(screen->machine,bitmap,cliprect,0x00,0x00); tilemap_draw(bitmap,cliprect,madmotor_pf1_tilemap,0,0); return 0; } diff --git a/src/mame/video/magmax.c b/src/mame/video/magmax.c index 8331c925c36..ca03e079fc1 100644 --- a/src/mame/video/magmax.c +++ b/src/mame/video/magmax.c @@ -107,7 +107,7 @@ VIDEO_UPDATE( magmax ) UINT32 scroll_v = (*magmax_scroll_y) & 0xff; /*clear background-over-sprites bitmap*/ - fillbitmap(tmpbitmap, 0, &machine->screen[0].visarea); + fillbitmap(tmpbitmap, 0, &screen->machine->screen[0].visarea); for (v = 2*8; v < 30*8; v++) /*only for visible area*/ { @@ -203,13 +203,13 @@ VIDEO_UPDATE( magmax ) if (code & 0x80) /* sprite bankswitch */ code += (*magmax_vreg & 0x30) * 0x8; - drawgfx(bitmap, machine->gfx[1], + drawgfx(bitmap, screen->machine->gfx[1], code, color, flipx, flipy, sx, sy, cliprect, TRANSPARENCY_PENS, - colortable_get_transpen_mask(machine->colortable, machine->gfx[1], color, 0x1f)); + colortable_get_transpen_mask(screen->machine->colortable, screen->machine->gfx[1], color, 0x1f)); } } @@ -234,7 +234,7 @@ VIDEO_UPDATE( magmax ) sy = 31 - sy; } - drawgfx(bitmap, machine->gfx[0], + drawgfx(bitmap, screen->machine->gfx[0], code, 0, flipscreen, flipscreen, diff --git a/src/mame/video/mainsnk.c b/src/mame/video/mainsnk.c index 42cfb0170cb..44ae56d23e3 100644 --- a/src/mame/video/mainsnk.c +++ b/src/mame/video/mainsnk.c @@ -181,10 +181,10 @@ VIDEO_UPDATE(mainsnk) myclip.min_y = cliprect->min_y; myclip.max_y = cliprect->max_y; tilemap_draw(bitmap,&myclip,me_bg_tilemap,0,0); - draw_sprites(machine,bitmap,&myclip, 0,0 ); + draw_sprites(screen->machine,bitmap,&myclip, 0,0 ); tilemap_draw(bitmap,&myclip,me_fg_tilemap,0,0); - draw_status(machine,bitmap,cliprect,0,0x400 ); - draw_status(machine,bitmap,cliprect,32*8,0x40 ); + draw_status(screen->machine,bitmap,cliprect,0,0x400 ); + draw_status(screen->machine,bitmap,cliprect,32*8,0x40 ); update_palette(1); return 0; } @@ -197,10 +197,10 @@ VIDEO_UPDATE(canvas) myclip.min_y = cliprect->min_y; myclip.max_y = cliprect->max_y; tilemap_draw(bitmap,&myclip,me_bg_tilemap,0,0); - draw_sprites(machine,bitmap,&myclip, 0,0 ); + draw_sprites(screen->machine,bitmap,&myclip, 0,0 ); // tilemap_draw(bitmap,&myclip,me_fg_tilemap,0,0); -// draw_status(machine,bitmap,cliprect,0,0x400 ); -// draw_status(machine,bitmap,cliprect,32*8,0x40 ); +// draw_status(screen->machine,bitmap,cliprect,0,0x400 ); +// draw_status(screen->machine,bitmap,cliprect,32*8,0x40 ); update_palette(1); return 0; } diff --git a/src/mame/video/malzak.c b/src/mame/video/malzak.c index e802665c08d..33c7623caaa 100644 --- a/src/mame/video/malzak.c +++ b/src/mame/video/malzak.c @@ -177,15 +177,15 @@ VIDEO_UPDATE( malzak ) { if (saa5050_state.saa5050_flags & SAA5050_DBLHI) { - drawgfx (bitmap, machine->gfx[2], code, colour, 0, 0, - sx * 6, sy * 10, &machine->screen[0].visarea, TRANSPARENCY_NONE, 0); - drawgfx (bitmap, machine->gfx[3], code, colour, 0, 0, - sx * 6, (sy + 1) * 10, &machine->screen[0].visarea, TRANSPARENCY_NONE, 0); + drawgfx (bitmap, screen->machine->gfx[2], code, colour, 0, 0, + sx * 6, sy * 10, cliprect, TRANSPARENCY_NONE, 0); + drawgfx (bitmap, screen->machine->gfx[3], code, colour, 0, 0, + sx * 6, (sy + 1) * 10, cliprect, TRANSPARENCY_NONE, 0); } else { - drawgfx (bitmap, machine->gfx[1], code, colour, 0, 0, - sx * 6, sy * 10, &machine->screen[0].visarea, TRANSPARENCY_NONE, 0); + drawgfx (bitmap, screen->machine->gfx[1], code, colour, 0, 0, + sx * 6, sy * 10, cliprect, TRANSPARENCY_NONE, 0); } } } @@ -212,8 +212,8 @@ VIDEO_UPDATE( malzak ) if(sx < -15) sx+=256; - drawgfx(bitmap,machine->gfx[0],field[x*16 + y].code,7,0,0, - sx, sy, &machine->screen[0].visarea, TRANSPARENCY_PEN, 0); + drawgfx(bitmap,screen->machine->gfx[0],field[x*16 + y].code,7,0,0, + sx, sy, cliprect, TRANSPARENCY_PEN, 0); } /* update the S2636 chips */ diff --git a/src/mame/video/mappy.c b/src/mame/video/mappy.c index eec04720e14..ec4f696cf91 100644 --- a/src/mame/video/mappy.c +++ b/src/mame/video/mappy.c @@ -537,7 +537,7 @@ VIDEO_UPDATE( superpac ) tilemap_draw(bitmap,cliprect,bg_tilemap,1|TILEMAP_DRAW_OPAQUE,0); fillbitmap(sprite_bitmap,15,cliprect); - mappy_draw_sprites(machine,sprite_bitmap,cliprect,0,0,15); + mappy_draw_sprites(screen->machine,sprite_bitmap,cliprect,0,0,15); copybitmap_trans(bitmap,sprite_bitmap,0,0,0,0,cliprect,15); /* Redraw the high priority characters */ @@ -563,7 +563,7 @@ VIDEO_UPDATE( phozon ) tilemap_draw(bitmap,cliprect,bg_tilemap,0|TILEMAP_DRAW_OPAQUE,0); tilemap_draw(bitmap,cliprect,bg_tilemap,1|TILEMAP_DRAW_OPAQUE,0); - phozon_draw_sprites(machine,bitmap,cliprect); + phozon_draw_sprites(screen->machine,bitmap,cliprect); /* Redraw the high priority characters */ tilemap_draw(bitmap,cliprect,bg_tilemap,1,0); @@ -580,7 +580,7 @@ VIDEO_UPDATE( mappy ) tilemap_draw(bitmap,cliprect,bg_tilemap,0|TILEMAP_DRAW_OPAQUE,0); tilemap_draw(bitmap,cliprect,bg_tilemap,1|TILEMAP_DRAW_OPAQUE,0); - mappy_draw_sprites(machine,bitmap,cliprect,0,0,15); + mappy_draw_sprites(screen->machine,bitmap,cliprect,0,0,15); /* Redraw the high priority characters */ tilemap_draw(bitmap,cliprect,bg_tilemap,1,0); diff --git a/src/mame/video/marineb.c b/src/mame/video/marineb.c index 6788e4b4ff6..97f42885698 100644 --- a/src/mame/video/marineb.c +++ b/src/mame/video/marineb.c @@ -193,7 +193,7 @@ VIDEO_UPDATE( marineb ) if (!flipscreen_y) { - sy = 256 - machine->gfx[gfx]->width - sy; + sy = 256 - screen->machine->gfx[gfx]->width - sy; flipy = !flipy; } @@ -202,7 +202,7 @@ VIDEO_UPDATE( marineb ) sx++; } - drawgfx(bitmap,machine->gfx[gfx], + drawgfx(bitmap,screen->machine->gfx[gfx], code, col, flipx,flipy, @@ -239,7 +239,7 @@ VIDEO_UPDATE( changes ) if (!flipscreen_y) { - sy = 256 - machine->gfx[1]->width - sy; + sy = 256 - screen->machine->gfx[1]->width - sy; flipy = !flipy; } @@ -248,7 +248,7 @@ VIDEO_UPDATE( changes ) sx++; } - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], code >> 2, col, flipx,flipy, @@ -267,7 +267,7 @@ VIDEO_UPDATE( changes ) if (!flipscreen_y) { - sy = 256 - machine->gfx[2]->width - sy; + sy = 256 - screen->machine->gfx[2]->width - sy; flipy = !flipy; } @@ -278,7 +278,7 @@ VIDEO_UPDATE( changes ) code >>= 4; - drawgfx(bitmap,machine->gfx[2], + drawgfx(bitmap,screen->machine->gfx[2], code, col, flipx,flipy, @@ -287,7 +287,7 @@ VIDEO_UPDATE( changes ) /* draw again for wrap around */ - drawgfx(bitmap,machine->gfx[2], + drawgfx(bitmap,screen->machine->gfx[2], code, col, flipx,flipy, @@ -341,7 +341,7 @@ VIDEO_UPDATE( springer ) if (!flipscreen_y) { - sy = 256 - machine->gfx[gfx]->width - sy; + sy = 256 - screen->machine->gfx[gfx]->width - sy; flipy = !flipy; } @@ -350,7 +350,7 @@ VIDEO_UPDATE( springer ) sx--; } - drawgfx(bitmap,machine->gfx[gfx], + drawgfx(bitmap,screen->machine->gfx[gfx], code, col, flipx,flipy, @@ -388,17 +388,17 @@ VIDEO_UPDATE( hoccer ) if (!flipscreen_y) { - sy = 256 - machine->gfx[1]->width - sy; + sy = 256 - screen->machine->gfx[1]->width - sy; flipy = !flipy; } if (flipscreen_x) { - sx = 256 - machine->gfx[1]->width - sx; + sx = 256 - screen->machine->gfx[1]->width - sx; flipx = !flipx; } - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], code >> 2, col, flipx,flipy, @@ -452,7 +452,7 @@ VIDEO_UPDATE( hopprobo ) if (!flipscreen_y) { - sy = 256 - machine->gfx[gfx]->width - sy; + sy = 256 - screen->machine->gfx[gfx]->width - sy; flipy = !flipy; } @@ -461,7 +461,7 @@ VIDEO_UPDATE( hopprobo ) sx--; } - drawgfx(bitmap,machine->gfx[gfx], + drawgfx(bitmap,screen->machine->gfx[gfx], code, col, flipx,flipy, diff --git a/src/mame/video/mario.c b/src/mame/video/mario.c index cc2d9f7a113..f153ce2d5fc 100644 --- a/src/mame/video/mario.c +++ b/src/mame/video/mario.c @@ -209,7 +209,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( mario ) { - mario_state *state = machine->driver_data; + mario_state *state = screen->machine->driver_data; int t; t = readinputportbytag("MONITOR"); @@ -223,7 +223,7 @@ VIDEO_UPDATE( mario ) tilemap_set_scrolly(state->bg_tilemap, 0, state->gfx_scroll - (state->flip ? 8 : 0)); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/markham.c b/src/mame/video/markham.c index 98741815903..7cd3041635f 100644 --- a/src/mame/video/markham.c +++ b/src/mame/video/markham.c @@ -131,6 +131,6 @@ VIDEO_UPDATE( markham ) } tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/marvins.c b/src/mame/video/marvins.c index 5631385a308..68efb04cb9b 100644 --- a/src/mame/video/marvins.c +++ b/src/mame/video/marvins.c @@ -344,7 +344,7 @@ VIDEO_UPDATE( marvins ) if( scroll_attributes & 2 ) fg_scrollx += 256; /* palette bank for background/foreground is set by a memory-write handler */ - update_palette(machine, 0); + update_palette(screen->machine, 0); if( flipscreen != (attributes&0x80) ) { @@ -359,12 +359,12 @@ VIDEO_UPDATE( marvins ) tilemap_set_scrollx( tx_tilemap, 0, 0 ); tilemap_set_scrolly( tx_tilemap, 0, 0 ); - tilemap_draw( bitmap,&finalclip,fg_tilemap,TILEMAP_DRAW_OPAQUE ,0); - draw_sprites( machine,bitmap,cliprect, sprite_scrollx+29+1, sprite_scrolly+16, 0, sprite_partition ); - tilemap_draw( bitmap,&finalclip,bg_tilemap,0 ,0); - draw_sprites( machine,bitmap,cliprect, sprite_scrollx+29+1, sprite_scrolly+16, 1, sprite_partition ); - tilemap_draw( bitmap,&finalclip,tx_tilemap,0 ,0); - draw_status( machine,bitmap,cliprect ); + tilemap_draw(bitmap,&finalclip,fg_tilemap,TILEMAP_DRAW_OPAQUE ,0); + draw_sprites(screen->machine,bitmap,cliprect, sprite_scrollx+29+1, sprite_scrolly+16, 0, sprite_partition ); + tilemap_draw(bitmap,&finalclip,bg_tilemap,0 ,0); + draw_sprites(screen->machine,bitmap,cliprect, sprite_scrollx+29+1, sprite_scrolly+16, 1, sprite_partition ); + tilemap_draw(bitmap,&finalclip,tx_tilemap,0 ,0); + draw_status(screen->machine,bitmap,cliprect ); } cpuintrf_pop_context(); return 0; @@ -406,8 +406,8 @@ VIDEO_UPDATE( madcrash ) if( scroll_attributes & 1 ) sprite_scrollx += 256; if( scroll_attributes & 2 ) fg_scrollx += 256; - marvins_palette_bank_w(machine, 0, program_read_byte(0xc800+madcrash_vreg)); - update_palette(machine, 1); + marvins_palette_bank_w(screen->machine, 0, program_read_byte(0xc800+madcrash_vreg)); + update_palette(screen->machine, 1); if( flipscreen != (attributes&0x80) ) { @@ -422,12 +422,12 @@ VIDEO_UPDATE( madcrash ) tilemap_set_scrollx( tx_tilemap, 0, 0 ); tilemap_set_scrolly( tx_tilemap, 0, 0 ); - tilemap_draw( bitmap,&finalclip,bg_tilemap,TILEMAP_DRAW_OPAQUE ,0); - draw_sprites( machine,bitmap,cliprect, sprite_scrollx+29, sprite_scrolly+17, 0, sprite_partition ); - tilemap_draw( bitmap,&finalclip,fg_tilemap,0 ,0); - draw_sprites( machine,bitmap,cliprect, sprite_scrollx+29, sprite_scrolly+17, 1, sprite_partition ); - tilemap_draw( bitmap,&finalclip,tx_tilemap,0 ,0); - draw_status( machine,bitmap,cliprect ); + tilemap_draw(bitmap,&finalclip,bg_tilemap,TILEMAP_DRAW_OPAQUE ,0); + draw_sprites(screen->machine,bitmap,cliprect, sprite_scrollx+29, sprite_scrolly+17, 0, sprite_partition ); + tilemap_draw(bitmap,&finalclip,fg_tilemap,0 ,0); + draw_sprites(screen->machine,bitmap,cliprect, sprite_scrollx+29, sprite_scrolly+17, 1, sprite_partition ); + tilemap_draw(bitmap,&finalclip,tx_tilemap,0 ,0); + draw_status(screen->machine,bitmap,cliprect ); } cpuintrf_pop_context(); return 0; diff --git a/src/mame/video/matmania.c b/src/mame/video/matmania.c index cd5f0a9693c..22200db1be1 100644 --- a/src/mame/video/matmania.c +++ b/src/mame/video/matmania.c @@ -148,7 +148,7 @@ VIDEO_UPDATE( matmania ) sx = 15 - offs / 32; sy = offs % 32; - drawgfx(tmpbitmap,machine->gfx[1], + drawgfx(tmpbitmap,screen->machine->gfx[1], videoram[offs] + ((colorram[offs] & 0x08) << 5), (colorram[offs] & 0x30) >> 4, 0,sy >= 16, /* flip horizontally tiles on the right half of the bitmap */ @@ -165,7 +165,7 @@ VIDEO_UPDATE( matmania ) sx = 15 - offs / 32; sy = offs % 32; - drawgfx(tmpbitmap2,machine->gfx[1], + drawgfx(tmpbitmap2,screen->machine->gfx[1], matmania_videoram3[offs] + ((matmania_colorram3[offs] & 0x08) << 5), (matmania_colorram3[offs] & 0x30) >> 4, 0,sy >= 16, /* flip horizontally tiles on the right half of the bitmap */ @@ -192,7 +192,7 @@ VIDEO_UPDATE( matmania ) { if (spriteram[offs] & 0x01) { - drawgfx(bitmap,machine->gfx[2], + drawgfx(bitmap,screen->machine->gfx[2], spriteram[offs+1] + ((spriteram[offs] & 0xf0) << 4), (spriteram[offs] & 0x08) >> 3, spriteram[offs] & 0x04,spriteram[offs] & 0x02, @@ -211,7 +211,7 @@ VIDEO_UPDATE( matmania ) sx = 31 - offs / 32; sy = offs % 32; - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], matmania_videoram2[offs] + 256 * (matmania_colorram2[offs] & 0x07), (matmania_colorram2[offs] & 0x30) >> 4, 0,0, @@ -235,7 +235,7 @@ VIDEO_UPDATE( maniach ) sx = 15 - offs / 32; sy = offs % 32; - drawgfx(tmpbitmap,machine->gfx[1], + drawgfx(tmpbitmap,screen->machine->gfx[1], videoram[offs] + ((colorram[offs] & 0x03) << 8), (colorram[offs] & 0x30) >> 4, 0,sy >= 16, /* flip horizontally tiles on the right half of the bitmap */ @@ -252,7 +252,7 @@ VIDEO_UPDATE( maniach ) sx = 15 - offs / 32; sy = offs % 32; - drawgfx(tmpbitmap2,machine->gfx[1], + drawgfx(tmpbitmap2,screen->machine->gfx[1], matmania_videoram3[offs] + ((matmania_colorram3[offs] & 0x03) << 8), (matmania_colorram3[offs] & 0x30) >> 4, 0,sy >= 16, /* flip horizontally tiles on the right half of the bitmap */ @@ -280,7 +280,7 @@ VIDEO_UPDATE( maniach ) { if (spriteram[offs] & 0x01) { - drawgfx(bitmap,machine->gfx[2], + drawgfx(bitmap,screen->machine->gfx[2], spriteram[offs+1] + ((spriteram[offs] & 0xf0) << 4), (spriteram[offs] & 0x08) >> 3, spriteram[offs] & 0x04,spriteram[offs] & 0x02, @@ -299,7 +299,7 @@ VIDEO_UPDATE( maniach ) sx = 31 - offs / 32; sy = offs % 32; - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], matmania_videoram2[offs] + 256 * (matmania_colorram2[offs] & 0x07), (matmania_colorram2[offs] & 0x30) >> 4, 0,0, diff --git a/src/mame/video/mcatadv.c b/src/mame/video/mcatadv.c index 221cd805dd3..dbd5b2cbc7c 100644 --- a/src/mame/video/mcatadv.c +++ b/src/mame/video/mcatadv.c @@ -206,7 +206,7 @@ VIDEO_UPDATE( mcatadv ) { int i; - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); fillbitmap(priority_bitmap, 0, cliprect); if(mcatadv_scroll[2] != palette_bank1) { diff --git a/src/mame/video/mcr.c b/src/mame/video/mcr.c index 674a778255f..e59c9ee1c0a 100644 --- a/src/mame/video/mcr.c +++ b/src/mame/video/mcr.c @@ -400,18 +400,18 @@ VIDEO_UPDATE( mcr ) switch (mcr_sprite_board) { case 91399: - render_sprites_91399(machine, bitmap, cliprect); + render_sprites_91399(screen->machine, bitmap, cliprect); break; case 91464: if (mcr_cpu_board == 91442) - render_sprites_91464(machine, bitmap, cliprect, 0x00, 0x30, 0x00); + render_sprites_91464(screen->machine, bitmap, cliprect, 0x00, 0x30, 0x00); else if (mcr_cpu_board == 91475) - render_sprites_91464(machine, bitmap, cliprect, 0x00, 0x30, 0x40); + render_sprites_91464(screen->machine, bitmap, cliprect, 0x00, 0x30, 0x40); else if (mcr_cpu_board == 91490) - render_sprites_91464(machine, bitmap, cliprect, 0x00, 0x30, 0x00); + render_sprites_91464(screen->machine, bitmap, cliprect, 0x00, 0x30, 0x00); else if (mcr_cpu_board == 91721) - render_sprites_91464(machine, bitmap, cliprect, 0x00, 0x30, 0x00); + render_sprites_91464(screen->machine, bitmap, cliprect, 0x00, 0x30, 0x00); break; } return 0; diff --git a/src/mame/video/mcr3.c b/src/mame/video/mcr3.c index f50cbd498d1..df94b2214c8 100644 --- a/src/mame/video/mcr3.c +++ b/src/mame/video/mcr3.c @@ -271,7 +271,7 @@ VIDEO_UPDATE( mcr3 ) tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); /* draw the sprites */ - mcr3_update_sprites(machine, bitmap, cliprect, 0x03, 0, 0, 0); + mcr3_update_sprites(screen->machine, bitmap, cliprect, 0x03, 0, 0, 0); return 0; } @@ -285,7 +285,7 @@ VIDEO_UPDATE( spyhunt ) tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); /* draw the sprites */ - mcr3_update_sprites(machine, bitmap, cliprect, spyhunt_sprite_color_mask, 0, -12, 0); + mcr3_update_sprites(screen->machine, bitmap, cliprect, spyhunt_sprite_color_mask, 0, -12, 0); /* render any characters on top */ tilemap_draw(bitmap, cliprect, alpha_tilemap, 0, 0); diff --git a/src/mame/video/mcr68.c b/src/mame/video/mcr68.c index 9b5c1aaf53d..f60d124785a 100644 --- a/src/mame/video/mcr68.c +++ b/src/mame/video/mcr68.c @@ -308,13 +308,13 @@ VIDEO_UPDATE( mcr68 ) tilemap_draw(bitmap, cliprect, bg_tilemap, TILEMAP_DRAW_OPAQUE | 1, 0); /* draw the low-priority sprites */ - mcr68_update_sprites(machine, bitmap, cliprect, 0); + mcr68_update_sprites(screen->machine, bitmap, cliprect, 0); /* redraw tiles with priority over sprites */ tilemap_draw(bitmap, cliprect, bg_tilemap, 1, 0); /* draw the high-priority sprites */ - mcr68_update_sprites(machine, bitmap, cliprect, 1); + mcr68_update_sprites(screen->machine, bitmap, cliprect, 1); return 0; } @@ -325,12 +325,12 @@ VIDEO_UPDATE( zwackery ) tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); /* draw the low-priority sprites */ - zwackery_update_sprites(machine, bitmap, cliprect, 0); + zwackery_update_sprites(screen->machine, bitmap, cliprect, 0); /* redraw tiles with priority over sprites */ tilemap_draw(bitmap, cliprect, fg_tilemap, 1, 0); /* draw the high-priority sprites */ - zwackery_update_sprites(machine, bitmap, cliprect, 1); + zwackery_update_sprites(screen->machine, bitmap, cliprect, 1); return 0; } diff --git a/src/mame/video/meadows.c b/src/mame/video/meadows.c index 656a374f967..e2ebee5dea8 100644 --- a/src/mame/video/meadows.c +++ b/src/mame/video/meadows.c @@ -106,7 +106,7 @@ VIDEO_UPDATE( meadows ) tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); /* draw the sprites */ - if (machine->gfx[1]) - draw_sprites(machine, bitmap, cliprect); + if (screen->machine->gfx[1]) + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/megasys1.c b/src/mame/video/megasys1.c index ed6f44ceabd..00c1213ab76 100644 --- a/src/mame/video/megasys1.c +++ b/src/mame/video/megasys1.c @@ -1018,6 +1018,6 @@ VIDEO_UPDATE( megasys1 ) } if (active_layers & 0x08) - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/megazone.c b/src/mame/video/megazone.c index 9dad322ef12..30f83df4bfb 100644 --- a/src/mame/video/megazone.c +++ b/src/mame/video/megazone.c @@ -135,7 +135,7 @@ VIDEO_UPDATE( megazone ) flipy = !flipy; } - drawgfx(tmpbitmap,machine->gfx[1], + drawgfx(tmpbitmap,screen->machine->gfx[1], ((int)videoram[offs]) + ((colorram[offs] & (1<<7) ? 256 : 0) ), (colorram[offs] & 0x0f) + 0x10, flipx,flipy, @@ -182,13 +182,13 @@ VIDEO_UPDATE( megazone ) else sx = sx + 32; - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], spriteram[offs + 2], color, flipx,flipy, sx,sy, cliprect,TRANSPARENCY_PENS, - colortable_get_transpen_mask(machine->colortable, machine->gfx[0], color, 0)); + colortable_get_transpen_mask(screen->machine->colortable, screen->machine->gfx[0], color, 0)); } } @@ -216,7 +216,7 @@ VIDEO_UPDATE( megazone ) - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], ((int)megazone_videoram2[offs]) + ((megazone_colorram2[offs] & (1<<7) ? 256 : 0) ), (megazone_colorram2[offs] & 0x0f) + 0x10, flipx,flipy, diff --git a/src/mame/video/mermaid.c b/src/mame/video/mermaid.c index 8255d05b27c..d33cddc0540 100644 --- a/src/mame/video/mermaid.c +++ b/src/mame/video/mermaid.c @@ -189,6 +189,6 @@ VIDEO_UPDATE( mermaid ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/metlclsh.c b/src/mame/video/metlclsh.c index 44279e9024a..676e379c5f9 100644 --- a/src/mame/video/metlclsh.c +++ b/src/mame/video/metlclsh.c @@ -247,7 +247,7 @@ VIDEO_UPDATE( metlclsh ) tilemap_set_scrollx(bg_tilemap, 0,metlclsh_scrollx[1] + ((metlclsh_scrollx[0]&0x02)<<7) ); tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); } - draw_sprites(machine,bitmap,cliprect); // sprites + draw_sprites(screen->machine,bitmap,cliprect); // sprites tilemap_draw(bitmap,cliprect,fg_tilemap,2,0); // high priority tiles of foreground // popmessage("%02X",metlclsh_scrollx[0]); diff --git a/src/mame/video/metro.c b/src/mame/video/metro.c index 3aacb95e918..99ca3a40f68 100644 --- a/src/mame/video/metro.c +++ b/src/mame/video/metro.c @@ -868,8 +868,8 @@ VIDEO_UPDATE( metro ) } } - metro_sprite_xoffs = metro_videoregs[0x06/2] - machine->screen[0].width / 2; - metro_sprite_yoffs = metro_videoregs[0x04/2] - machine->screen[0].height / 2; + metro_sprite_xoffs = metro_videoregs[0x06/2] - screen->machine->screen[0].width / 2; + metro_sprite_yoffs = metro_videoregs[0x04/2] - screen->machine->screen[0].height / 2; /* The background color is selected by a register */ fillbitmap(priority_bitmap,0,cliprect); @@ -929,9 +929,9 @@ if (input_code_pressed(KEYCODE_Z)) for (pri=3; pri>=0; pri--) - draw_layers(machine, bitmap,cliprect,pri,layers_ctrl); + draw_layers(screen->machine, bitmap,cliprect,pri,layers_ctrl); if (layers_ctrl & 0x08) - metro_draw_sprites(machine, bitmap,cliprect); + metro_draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/mexico86.c b/src/mame/video/mexico86.c index 0c7e67879c7..74aca943e5f 100644 --- a/src/mame/video/mexico86.c +++ b/src/mame/video/mexico86.c @@ -31,8 +31,7 @@ VIDEO_UPDATE( mexico86 ) /* and sprites) are stored in the same memory region, and information on */ /* the background character columns is stored inthe area dd00-dd3f */ - /* This clears & redraws the entire screen each pass */ - fillbitmap(bitmap,255,&machine->screen[0].visarea); + fillbitmap(bitmap,255,cliprect); sx = 0; /* the score display seems to be outside of the main objectram. */ @@ -88,12 +87,12 @@ if (offs >= mexico86_objectram_size+0x1c0) continue; x = (sx + xc * 8) & 0xff; y = (sy + yc * 8) & 0xff; - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], code, color, flipx,flipy, x,y, - &machine->screen[0].visarea,TRANSPARENCY_PEN,15); + cliprect,TRANSPARENCY_PEN,15); } } } @@ -190,7 +189,7 @@ VIDEO_UPDATE( kikikai ) int goffs,code,color,y; int tx, ty; - fillbitmap(bitmap, get_black_pen(machine), &machine->screen[0].visarea); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); sx = 0; for (offs=0; offs<mexico86_objectram_size; offs+=4) { @@ -226,22 +225,22 @@ VIDEO_UPDATE( kikikai ) color = (mexico86_videoram[goffs + 1] & 0xe0) >> 5; goffs += 0x40; - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], code, color, 0,0, sx&0xff,y, - &machine->screen[0].visarea,TRANSPARENCY_PEN,15); + cliprect,TRANSPARENCY_PEN,15); code = mexico86_videoram[goffs] + ((mexico86_videoram[goffs + 1] & 0x1f) << 8); color = (mexico86_videoram[goffs + 1] & 0xe0) >> 5; - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], code, color, 0,0, (sx+8)&0xff,y, - &machine->screen[0].visarea,TRANSPARENCY_PEN,15); + cliprect,TRANSPARENCY_PEN,15); } } return 0; diff --git a/src/mame/video/midvunit.c b/src/mame/video/midvunit.c index 13a0e0acbbc..ab17a586a0a 100644 --- a/src/mame/video/midvunit.c +++ b/src/mame/video/midvunit.c @@ -572,7 +572,7 @@ VIDEO_UPDATE( midvunit ) /* adjust the offset */ offset += xoffs; - offset += 512 * (cliprect->min_y - machine->screen[0].visarea.min_y); + offset += 512 * (cliprect->min_y - screen->machine->screen[0].visarea.min_y); /* loop over rows */ for (y = cliprect->min_y; y <= cliprect->max_y; y++) diff --git a/src/mame/video/midzeus.c b/src/mame/video/midzeus.c index 9a7d026c311..2f0fef5610a 100644 --- a/src/mame/video/midzeus.c +++ b/src/mame/video/midzeus.c @@ -318,7 +318,7 @@ VIDEO_UPDATE( midzeus ) if (!input_code_pressed(KEYCODE_W)) { const void *base = waveram1_ptr_from_expanded_addr(zeusbase[0xcc]); - int xoffs = machine->screen[screen].visarea.min_x; + int xoffs = screen->machine->screen[scrnum].visarea.min_x; for (y = cliprect->min_y; y <= cliprect->max_y; y++) { UINT16 *dest = (UINT16 *)bitmap->base + y * bitmap->rowpixels; diff --git a/src/mame/video/midzeus2.c b/src/mame/video/midzeus2.c index 4c62dc5ab15..373ec6f9369 100644 --- a/src/mame/video/midzeus2.c +++ b/src/mame/video/midzeus2.c @@ -370,7 +370,7 @@ if (input_code_pressed(KEYCODE_DOWN)) { zbase -= 1.0f; popmessage("Zbase = %f", if (!input_code_pressed(KEYCODE_W)) { const void *base = waveram1_ptr_from_expanded_addr(zeusbase[0x38]); - int xoffs = machine->screen[screen].visarea.min_x; + int xoffs = screen->machine->screen[scrnum].visarea.min_x; for (y = cliprect->min_y; y <= cliprect->max_y; y++) { UINT32 *dest = (UINT32 *)bitmap->base + y * bitmap->rowpixels; diff --git a/src/mame/video/mikie.c b/src/mame/video/mikie.c index dae04e2b067..2c245ca0391 100644 --- a/src/mame/video/mikie.c +++ b/src/mame/video/mikie.c @@ -167,6 +167,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( mikie ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/mitchell.c b/src/mame/video/mitchell.c index fc2fe01e817..c357b632143 100644 --- a/src/mame/video/mitchell.c +++ b/src/mame/video/mitchell.c @@ -283,6 +283,6 @@ VIDEO_UPDATE( pang ) { fillbitmap(bitmap,0,cliprect); tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/mjkjidai.c b/src/mame/video/mjkjidai.c index 887bc3c2a21..c7d686b19c1 100644 --- a/src/mame/video/mjkjidai.c +++ b/src/mame/video/mjkjidai.c @@ -129,13 +129,11 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( mjkjidai ) { if (!display_enable) - { - fillbitmap(bitmap,get_black_pen(machine),cliprect); - } + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); else { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); } return 0; } diff --git a/src/mame/video/mjsister.c b/src/mame/video/mjsister.c index b38ce820654..d7fa915852d 100644 --- a/src/mame/video/mjsister.c +++ b/src/mame/video/mjsister.c @@ -104,6 +104,6 @@ VIDEO_UPDATE( mjsister ) copybitmap_trans(bitmap,mjsister_tmpbitmap1,f,f,2,0,cliprect,0); } else - fillbitmap(bitmap, get_black_pen(machine), &machine->screen[0].visarea); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); return 0; } diff --git a/src/mame/video/model1.c b/src/mame/video/model1.c index ea57a2738b6..4392d0b57b4 100644 --- a/src/mame/video/model1.c +++ b/src/mame/video/model1.c @@ -459,10 +459,10 @@ static void draw_quads(bitmap_t *bitmap, const rectangle *cliprect) fill_quad(bitmap, q); #if 0 - draw_line(bitmap, get_black_pen(machine), q->p[0]->s.x, q->p[0]->s.y, q->p[1]->s.x, q->p[1]->s.y); - draw_line(bitmap, get_black_pen(machine), q->p[1]->s.x, q->p[1]->s.y, q->p[2]->s.x, q->p[2]->s.y); - draw_line(bitmap, get_black_pen(machine), q->p[2]->s.x, q->p[2]->s.y, q->p[3]->s.x, q->p[3]->s.y); - draw_line(bitmap, get_black_pen(machine), q->p[3]->s.x, q->p[3]->s.y, q->p[0]->s.x, q->p[0]->s.y); + draw_line(bitmap, get_black_pen(screen->machine), q->p[0]->s.x, q->p[0]->s.y, q->p[1]->s.x, q->p[1]->s.y); + draw_line(bitmap, get_black_pen(screen->machine), q->p[1]->s.x, q->p[1]->s.y, q->p[2]->s.x, q->p[2]->s.y); + draw_line(bitmap, get_black_pen(screen->machine), q->p[2]->s.x, q->p[2]->s.y, q->p[3]->s.x, q->p[3]->s.y); + draw_line(bitmap, get_black_pen(screen->machine), q->p[3]->s.x, q->p[3]->s.y, q->p[0]->s.x, q->p[0]->s.y); #endif } @@ -1458,7 +1458,7 @@ VIDEO_START(model1) VIDEO_UPDATE(model1) { - sys24_tile_update(machine); + sys24_tile_update(screen->machine); #if 0 { int mod = 0; @@ -1506,19 +1506,19 @@ VIDEO_UPDATE(model1) ayys = sin(ayy); fillbitmap(priority_bitmap, 0, NULL); - fillbitmap(bitmap, machine->pens[0], &machine->screen[0].visarea); + fillbitmap(bitmap, screen->machine->pens[0], cliprect); - sys24_tile_draw(machine, bitmap, cliprect, 6, 0, 0); - sys24_tile_draw(machine, bitmap, cliprect, 4, 0, 0); - sys24_tile_draw(machine, bitmap, cliprect, 2, 0, 0); - sys24_tile_draw(machine, bitmap, cliprect, 0, 0, 0); + sys24_tile_draw(screen->machine, bitmap, cliprect, 6, 0, 0); + sys24_tile_draw(screen->machine, bitmap, cliprect, 4, 0, 0); + sys24_tile_draw(screen->machine, bitmap, cliprect, 2, 0, 0); + sys24_tile_draw(screen->machine, bitmap, cliprect, 0, 0, 0); tgp_render(bitmap, cliprect); - sys24_tile_draw(machine, bitmap, cliprect, 7, 0, 0); - sys24_tile_draw(machine, bitmap, cliprect, 5, 0, 0); - sys24_tile_draw(machine, bitmap, cliprect, 3, 0, 0); - sys24_tile_draw(machine, bitmap, cliprect, 1, 0, 0); + sys24_tile_draw(screen->machine, bitmap, cliprect, 7, 0, 0); + sys24_tile_draw(screen->machine, bitmap, cliprect, 5, 0, 0); + sys24_tile_draw(screen->machine, bitmap, cliprect, 3, 0, 0); + sys24_tile_draw(screen->machine, bitmap, cliprect, 1, 0, 0); return 0; } diff --git a/src/mame/video/model2.c b/src/mame/video/model2.c index 3d6ad59ffb6..06993fb6280 100644 --- a/src/mame/video/model2.c +++ b/src/mame/video/model2.c @@ -2740,16 +2740,16 @@ VIDEO_UPDATE(model2) { logerror("--- frame ---\n"); - sys24_tile_update(machine); - fillbitmap(bitmap, machine->pens[0], &machine->screen[0].visarea); - fillbitmap(sys24_bitmap, 0, &machine->screen[0].visarea); + sys24_tile_update(screen->machine); + fillbitmap(bitmap, screen->machine->pens[0], cliprect); + fillbitmap(sys24_bitmap, 0, cliprect); - sys24_tile_draw(machine, sys24_bitmap, cliprect, 7, 0, 0); - sys24_tile_draw(machine, sys24_bitmap, cliprect, 6, 0, 0); - sys24_tile_draw(machine, sys24_bitmap, cliprect, 5, 0, 0); - sys24_tile_draw(machine, sys24_bitmap, cliprect, 4, 0, 0); + sys24_tile_draw(screen->machine, sys24_bitmap, cliprect, 7, 0, 0); + sys24_tile_draw(screen->machine, sys24_bitmap, cliprect, 6, 0, 0); + sys24_tile_draw(screen->machine, sys24_bitmap, cliprect, 5, 0, 0); + sys24_tile_draw(screen->machine, sys24_bitmap, cliprect, 4, 0, 0); - convert_bitmap(machine, bitmap, sys24_bitmap, cliprect); + convert_bitmap(screen->machine, bitmap, sys24_bitmap, cliprect); /* tell the rasterizer we're starting a frame */ model2_3d_frame_start(); @@ -2760,13 +2760,13 @@ VIDEO_UPDATE(model2) /* have the rasterizer output the frame */ model2_3d_frame_end( bitmap, cliprect ); - fillbitmap(sys24_bitmap, 0, &machine->screen[0].visarea); - sys24_tile_draw(machine, sys24_bitmap, cliprect, 3, 0, 0); - sys24_tile_draw(machine, sys24_bitmap, cliprect, 2, 0, 0); - sys24_tile_draw(machine, sys24_bitmap, cliprect, 1, 0, 0); - sys24_tile_draw(machine, sys24_bitmap, cliprect, 0, 0, 0); + fillbitmap(sys24_bitmap, 0, cliprect); + sys24_tile_draw(screen->machine, sys24_bitmap, cliprect, 3, 0, 0); + sys24_tile_draw(screen->machine, sys24_bitmap, cliprect, 2, 0, 0); + sys24_tile_draw(screen->machine, sys24_bitmap, cliprect, 1, 0, 0); + sys24_tile_draw(screen->machine, sys24_bitmap, cliprect, 0, 0, 0); - convert_bitmap(machine, bitmap, sys24_bitmap, cliprect); + convert_bitmap(screen->machine, bitmap, sys24_bitmap, cliprect); return 0; } diff --git a/src/mame/video/momoko.c b/src/mame/video/momoko.c index 95ff533c388..7f0bba37332 100644 --- a/src/mame/video/momoko.c +++ b/src/mame/video/momoko.c @@ -142,17 +142,17 @@ VIDEO_UPDATE( momoko ) py = 248-(8*y+dy+9); } - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], chr, col, flip,flip, px,py, - &machine->screen[0].visarea,TRANSPARENCY_NONE,0); + cliprect,TRANSPARENCY_NONE,0); } } } else - fillbitmap(bitmap, 256, 0); + fillbitmap(bitmap, 256, cliprect); /* draw sprites (momoko) */ @@ -177,12 +177,12 @@ VIDEO_UPDATE( momoko ) py = y+1; } - drawgfx(bitmap,machine->gfx[3], + drawgfx(bitmap,screen->machine->gfx[3], chr, col, !fx,fy, px,py, - &machine->screen[0].visarea,TRANSPARENCY_PEN,0); + cliprect,TRANSPARENCY_PEN,0); } @@ -241,12 +241,12 @@ VIDEO_UPDATE( momoko ) px = 248-x; py = y+1; } - drawgfx(bitmap,machine->gfx[3], + drawgfx(bitmap,screen->machine->gfx[3], chr, col, !fx,fy, px,py, - &machine->screen[0].visarea,TRANSPARENCY_PEN,0); + cliprect,TRANSPARENCY_PEN,0); } @@ -276,12 +276,12 @@ VIDEO_UPDATE( momoko ) px = 248-x*8; py = 255-y; } - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], videoram[(sy>>3)*32+x]*8+dy, col, flip,0, px,py, - &machine->screen[0].visarea,TRANSPARENCY_PEN,0); + cliprect,TRANSPARENCY_PEN,0); } } @@ -311,12 +311,12 @@ VIDEO_UPDATE( momoko ) px = 248-(8*x+dx-8); py = 248-(8*y+dy+9); } - drawgfx(bitmap,machine->gfx[2], + drawgfx(bitmap,screen->machine->gfx[2], chr, 0, /* color */ flip,flip, /* flip */ px,py, - &machine->screen[0].visarea,TRANSPARENCY_PEN,0); + cliprect,TRANSPARENCY_PEN,0); } } } diff --git a/src/mame/video/moo.c b/src/mame/video/moo.c index 87acfab2d1b..7ad95da632d 100644 --- a/src/mame/video/moo.c +++ b/src/mame/video/moo.c @@ -143,15 +143,15 @@ VIDEO_UPDATE(moo) sortlayers(layers, layerpri); - K054338_update_all_shadows(machine); - K054338_fill_backcolor(machine, bitmap, 0); + K054338_update_all_shadows(screen->machine); + K054338_fill_backcolor(screen->machine, bitmap, 0); fillbitmap(priority_bitmap,0,cliprect); if (layerpri[0] < K053251_get_priority(K053251_CI1)) /* bucky hides back layer behind background */ - K056832_tilemap_draw(machine, bitmap, cliprect, layers[0], 0, 1); + K056832_tilemap_draw(screen->machine, bitmap, cliprect, layers[0], 0, 1); - K056832_tilemap_draw(machine, bitmap, cliprect, layers[1], 0, 2); + K056832_tilemap_draw(screen->machine, bitmap, cliprect, layers[1], 0, 2); // Enabling alpha improves fog and fading in Moo but causes other things to disappear. // There is probably a control bit somewhere to turn off alpha blending. @@ -160,10 +160,10 @@ VIDEO_UPDATE(moo) alpha = (alpha_enabled) ? K054338_set_alpha_level(1) : 255; if (alpha > 0) - K056832_tilemap_draw(machine, bitmap, cliprect, layers[2], (alpha >= 255) ? 0 : TILEMAP_DRAW_ALPHA, 4); + K056832_tilemap_draw(screen->machine, bitmap, cliprect, layers[2], (alpha >= 255) ? 0 : TILEMAP_DRAW_ALPHA, 4); - K053247_sprites_draw(machine, bitmap,cliprect); + K053247_sprites_draw(screen->machine, bitmap,cliprect); - K056832_tilemap_draw(machine, bitmap, cliprect, 0, 0, 0); + K056832_tilemap_draw(screen->machine, bitmap, cliprect, 0, 0, 0); return 0; } diff --git a/src/mame/video/mouser.c b/src/mame/video/mouser.c index 7af0f585525..e646598f8c4 100644 --- a/src/mame/video/mouser.c +++ b/src/mame/video/mouser.c @@ -87,7 +87,7 @@ VIDEO_UPDATE( mouser ) /* Note: this is _not_ dependant on flipping */ color_offs = offs%32 + ((256 + 8*(offs/32) - spriteram[offs%32])%256)/8*32; - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], videoram[offs] | (colorram[color_offs]>>5)*256 | ((colorram[color_offs]>>4)&1)*512, colorram[color_offs]%16, flip_screen_x_get(),flip_screen_y_get(), @@ -119,7 +119,7 @@ VIDEO_UPDATE( mouser ) } if ((spriteram[offs+1]&0x10)>>4) - drawgfx(bitmap,machine->gfx[1+((spriteram[offs+1]&0x20)>>5)], + drawgfx(bitmap,screen->machine->gfx[1+((spriteram[offs+1]&0x20)>>5)], spriteram[offs]&0x3f, spriteram[offs+1]%16, flipx,flipy, @@ -149,7 +149,7 @@ VIDEO_UPDATE( mouser ) } if ((spriteram[offs+1]&0x10)>>4) - drawgfx(bitmap,machine->gfx[1+((spriteram[offs+1]&0x20)>>5)], + drawgfx(bitmap,screen->machine->gfx[1+((spriteram[offs+1]&0x20)>>5)], spriteram[offs]&0x3f, spriteram[offs+1]%16, flipx,flipy, diff --git a/src/mame/video/mrdo.c b/src/mame/video/mrdo.c index be963560aac..29080d3ae34 100644 --- a/src/mame/video/mrdo.c +++ b/src/mame/video/mrdo.c @@ -248,6 +248,6 @@ VIDEO_UPDATE( mrdo ) fillbitmap(bitmap,0,cliprect); tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/mrflea.c b/src/mame/video/mrflea.c index 4ec6a9c200c..d9e68e5e212 100644 --- a/src/mame/video/mrflea.c +++ b/src/mame/video/mrflea.c @@ -91,7 +91,7 @@ VIDEO_START( mrflea ){ VIDEO_UPDATE( mrflea ) { - draw_background(machine, bitmap, cliprect); - draw_sprites(machine, bitmap, cliprect); + draw_background(screen->machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/mrjong.c b/src/mame/video/mrjong.c index 869849114ab..b069e5cea39 100644 --- a/src/mame/video/mrjong.c +++ b/src/mame/video/mrjong.c @@ -139,6 +139,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( mrjong ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/ms32.c b/src/mame/video/ms32.c index e85631665b0..909776659ec 100644 --- a/src/mame/video/ms32.c +++ b/src/mame/video/ms32.c @@ -492,12 +492,12 @@ VIDEO_UPDATE( ms32 ) /* priority hack, we really need to figure out what priority ram is I think */ - if (!strcmp(machine->gamedrv->name,"hayaosi3")) + if (!strcmp(screen->machine->gamedrv->name,"hayaosi3")) { tilemap_draw(bitmap,cliprect,ms32_bg_tilemap,0,1); tilemap_draw(bitmap,cliprect,ms32_tx_tilemap,0,4); draw_roz(bitmap,cliprect,4); // this question text needs to appear over the sprites - draw_sprites(machine,bitmap,cliprect, ms32_spram, 0x40000); + draw_sprites(screen->machine,bitmap,cliprect, ms32_spram, 0x40000); } else @@ -505,7 +505,7 @@ VIDEO_UPDATE( ms32 ) tilemap_draw(bitmap,cliprect,ms32_bg_tilemap,0,1); draw_roz(bitmap,cliprect,2); tilemap_draw(bitmap,cliprect,ms32_tx_tilemap,0,4); - draw_sprites(machine,bitmap,cliprect, ms32_spram, 0x40000); + draw_sprites(screen->machine,bitmap,cliprect, ms32_spram, 0x40000); } diff --git a/src/mame/video/msisaac.c b/src/mame/video/msisaac.c index 64bdef4cf16..a301e14021d 100644 --- a/src/mame/video/msisaac.c +++ b/src/mame/video/msisaac.c @@ -244,7 +244,7 @@ VIDEO_UPDATE( msisaac ) { tilemap_draw(bitmap,cliprect,background, 0,0); tilemap_draw(bitmap,cliprect,background2,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,foreground, 0,0); return 0; } diff --git a/src/mame/video/mugsmash.c b/src/mame/video/mugsmash.c index 88c195b35c6..ae00340960d 100644 --- a/src/mame/video/mugsmash.c +++ b/src/mame/video/mugsmash.c @@ -150,6 +150,6 @@ VIDEO_UPDATE( mugsmash ) { tilemap_draw(bitmap,cliprect,mugsmash_tilemap2,0,0); tilemap_draw(bitmap,cliprect,mugsmash_tilemap1,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/munchmo.c b/src/mame/video/munchmo.c index 5276f6d89a2..b93e76f7a7c 100644 --- a/src/mame/video/munchmo.c +++ b/src/mame/video/munchmo.c @@ -160,8 +160,8 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( mnchmobl ) { - draw_background(machine, bitmap, cliprect); - draw_sprites(machine, bitmap, cliprect); - draw_status(machine, bitmap, cliprect); + draw_background(screen->machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); + draw_status(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/mustache.c b/src/mame/video/mustache.c index d02909a0cd4..bdf02706810 100644 --- a/src/mame/video/mustache.c +++ b/src/mame/video/mustache.c @@ -138,6 +138,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( mustache ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/mystston.c b/src/mame/video/mystston.c index 60c17393407..a0dc3ec3b39 100644 --- a/src/mame/video/mystston.c +++ b/src/mame/video/mystston.c @@ -255,18 +255,18 @@ static VIDEO_RESET( mystston ) static VIDEO_UPDATE( mystston ) { - mystston_state *state = machine->driver_data; + mystston_state *state = screen->machine->driver_data; int flip = (*state->video_control & 0x80) ^ ((readinputportbytag("DSW1") & 0x20) << 2); - set_palette(machine, state); + set_palette(screen->machine, state); tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); tilemap_set_scrolly(state->bg_tilemap, 0, *state->scroll); tilemap_set_flip(ALL_TILEMAPS, flip ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); - draw_sprites(state, machine->gfx, bitmap, cliprect, flip); + draw_sprites(state, screen->machine->gfx, bitmap, cliprect, flip); tilemap_draw(bitmap, cliprect, state->fg_tilemap, 0, 0); return 0; diff --git a/src/mame/video/mystwarr.c b/src/mame/video/mystwarr.c index d6ddfea03fc..08e992465bc 100644 --- a/src/mame/video/mystwarr.c +++ b/src/mame/video/mystwarr.c @@ -347,7 +347,7 @@ VIDEO_UPDATE(mystwarr) sprite_colorbase = K055555_get_palette_index(4)<<5; - konamigx_mixer(machine, bitmap, cliprect, 0, 0, 0, 0, blendmode); + konamigx_mixer(screen->machine, bitmap, cliprect, 0, 0, 0, 0, blendmode); return 0; } @@ -364,7 +364,7 @@ VIDEO_UPDATE(metamrph) sprite_colorbase = K055555_get_palette_index(4)<<4; - konamigx_mixer(machine, bitmap, cliprect, 0, GXSUB_K053250 | GXSUB_4BPP, 0, 0, 0); + konamigx_mixer(screen->machine, bitmap, cliprect, 0, GXSUB_K053250 | GXSUB_4BPP, 0, 0, 0); return 0; } @@ -387,7 +387,7 @@ VIDEO_UPDATE(martchmp) // not quite right blendmode = (oinprion==0xef && K054338_read_register(K338_REG_PBLEND)) ? ((1<<16|GXMIX_BLEND_FORCE)<<2) : 0; - konamigx_mixer(machine, bitmap, cliprect, 0, 0, 0, 0, blendmode); + konamigx_mixer(screen->machine, bitmap, cliprect, 0, 0, 0, 0, blendmode); return 0; } @@ -549,6 +549,6 @@ VIDEO_UPDATE(dadandrn) /* and gaiapols */ popmessage("K053936: PSAC colorbase changed"); } - konamigx_mixer(machine, bitmap, cliprect, (roz_enable) ? ult_936_tilemap : 0, rozmode, 0, 0, 0); + konamigx_mixer(screen->machine, bitmap, cliprect, (roz_enable) ? ult_936_tilemap : 0, rozmode, 0, 0, 0); return 0; } diff --git a/src/mame/video/namcofl.c b/src/mame/video/namcofl.c index ad3a96c9db9..6c081b513f5 100644 --- a/src/mame/video/namcofl.c +++ b/src/mame/video/namcofl.c @@ -146,16 +146,16 @@ VIDEO_UPDATE( namcofl ) int pri; handle_mcu(); - namcofl_install_palette(machine); + namcofl_install_palette(screen->machine); - fillbitmap( bitmap, get_black_pen(machine), cliprect ); + fillbitmap( bitmap, get_black_pen(screen->machine), cliprect ); for( pri=0; pri<16; pri++ ) { namco_roz_draw( bitmap,cliprect,pri ); if((pri&1)==0) namco_tilemap_draw( bitmap, cliprect, pri>>1 ); - namco_obj_draw(machine, bitmap, cliprect, pri ); + namco_obj_draw(screen->machine, bitmap, cliprect, pri ); } return 0; diff --git a/src/mame/video/namcona1.c b/src/mame/video/namcona1.c index fe76ddf2ec3..387b32a2cd0 100644 --- a/src/mame/video/namcona1.c +++ b/src/mame/video/namcona1.c @@ -635,11 +635,11 @@ VIDEO_UPDATE( namcona1 ) /* palette updates are delayed when graphics are disabled */ for( which=0; which<0x1000; which++ ) { - UpdatePalette(machine, which ); + UpdatePalette(screen->machine, which ); } palette_is_dirty = 0; } - update_gfx(machine); + update_gfx(screen->machine); for( which=0; which<NAMCONA1_NUM_TILEMAPS; which++ ) { static int tilemap_color; @@ -658,11 +658,11 @@ VIDEO_UPDATE( namcona1 ) { if( (namcona1_vreg[0x50+which]&0x7) == priority ) { - draw_background(machine,bitmap,cliprect,which,pri_mask[priority] ); + draw_background(screen->machine,bitmap,cliprect,which,pri_mask[priority] ); } } /* next tilemap */ } /* next priority level */ - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); } /* gfx enabled */ return 0; } diff --git a/src/mame/video/namconb1.c b/src/mame/video/namconb1.c index ab229d9efe5..ac5365c7bd4 100644 --- a/src/mame/video/namconb1.c +++ b/src/mame/video/namconb1.c @@ -205,9 +205,9 @@ VIDEO_UPDATE( namconb1 ) if( clip.max_x > cliprect->max_x ){ clip.max_x = cliprect->max_x; } if( clip.max_y > cliprect->max_y ){ clip.max_y = cliprect->max_y; } - fillbitmap( bitmap, get_black_pen(machine), cliprect ); + fillbitmap( bitmap, get_black_pen(screen->machine), cliprect ); - video_update_common( machine, bitmap, &clip, 0 ); + video_update_common( screen->machine, bitmap, &clip, 0 ); return 0; } @@ -244,14 +244,14 @@ VIDEO_UPDATE( namconb2 ) if( clip.max_x > cliprect->max_x ){ clip.max_x = cliprect->max_x; } if( clip.max_y > cliprect->max_y ){ clip.max_y = cliprect->max_y; } - fillbitmap( bitmap, get_black_pen(machine), cliprect ); + fillbitmap( bitmap, get_black_pen(screen->machine), cliprect ); if( memcmp(tilemap_tile_bank,namconb1_tilebank32,sizeof(tilemap_tile_bank))!=0 ) { namco_tilemap_invalidate(); memcpy(tilemap_tile_bank,namconb1_tilebank32,sizeof(tilemap_tile_bank)); } - video_update_common( machine, bitmap, &clip, 1 ); + video_update_common( screen->machine, bitmap, &clip, 1 ); return 0; } diff --git a/src/mame/video/namcos1.c b/src/mame/video/namcos1.c index bfa7e2486f0..a30a95f08ae 100644 --- a/src/mame/video/namcos1.c +++ b/src/mame/video/namcos1.c @@ -350,7 +350,7 @@ VIDEO_UPDATE( namcos1 ) /* background color */ - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); /* berabohm uses asymmetrical visibility windows to iris on the character */ i = ((namcos1_cus116[0] << 8) | namcos1_cus116[1]) - 1; // min x @@ -402,7 +402,7 @@ VIDEO_UPDATE( namcos1 ) } } - draw_sprites(machine, bitmap, &new_clip); + draw_sprites(screen->machine, bitmap, &new_clip); return 0; } diff --git a/src/mame/video/namcos2.c b/src/mame/video/namcos2.c index cae5ae36b45..137ec9e5b8a 100644 --- a/src/mame/video/namcos2.c +++ b/src/mame/video/namcos2.c @@ -348,7 +348,7 @@ VIDEO_UPDATE( namcos2_default ) int pri; UpdatePalette(); - fillbitmap( bitmap, get_black_pen(machine), cliprect ); + fillbitmap( bitmap, get_black_pen(screen->machine), cliprect ); ApplyClip( &clip, cliprect ); /* HACK: enable ROZ layer only if it has priority > 0 */ @@ -364,7 +364,7 @@ VIDEO_UPDATE( namcos2_default ) { DrawROZ(bitmap,&clip); } - namcos2_draw_sprites(machine, bitmap, &clip, pri/2, namcos2_gfx_ctrl ); + namcos2_draw_sprites(screen->machine, bitmap, &clip, pri/2, namcos2_gfx_ctrl ); } } return 0; @@ -385,7 +385,7 @@ VIDEO_UPDATE( finallap ) int pri; UpdatePalette(); - fillbitmap( bitmap, get_black_pen(machine), cliprect ); + fillbitmap( bitmap, get_black_pen(screen->machine), cliprect ); ApplyClip( &clip, cliprect ); for( pri=0; pri<16; pri++ ) @@ -394,8 +394,8 @@ VIDEO_UPDATE( finallap ) { namco_tilemap_draw( bitmap, &clip, pri/2 ); } - namco_road_draw(machine, bitmap,&clip,pri ); - namcos2_draw_sprites(machine, bitmap,&clip,pri,namcos2_gfx_ctrl ); + namco_road_draw(screen->machine, bitmap,&clip,pri ); + namcos2_draw_sprites(screen->machine, bitmap,&clip,pri,namcos2_gfx_ctrl ); } return 0; } @@ -422,7 +422,7 @@ VIDEO_UPDATE( luckywld ) int pri; UpdatePalette(); - fillbitmap( bitmap, get_black_pen(machine), cliprect ); + fillbitmap( bitmap, get_black_pen(screen->machine), cliprect ); ApplyClip( &clip, cliprect ); for( pri=0; pri<16; pri++ ) @@ -431,12 +431,12 @@ VIDEO_UPDATE( luckywld ) { namco_tilemap_draw( bitmap, &clip, pri/2 ); } - namco_road_draw(machine, bitmap,&clip,pri ); + namco_road_draw(screen->machine, bitmap,&clip,pri ); if( namcos2_gametype==NAMCOS2_LUCKY_AND_WILD ) { namco_roz_draw( bitmap, &clip, pri ); } - namco_obj_draw(machine, bitmap, &clip, pri ); + namco_obj_draw(screen->machine, bitmap, &clip, pri ); } return 0; } @@ -455,13 +455,13 @@ VIDEO_UPDATE( sgunner ) int pri; UpdatePalette(); - fillbitmap( bitmap, get_black_pen(machine), cliprect ); + fillbitmap( bitmap, get_black_pen(screen->machine), cliprect ); ApplyClip( &clip, cliprect ); for( pri=0; pri<8; pri++ ) { namco_tilemap_draw( bitmap, &clip, pri ); - namco_obj_draw(machine, bitmap, &clip, pri ); + namco_obj_draw(screen->machine, bitmap, &clip, pri ); } return 0; } @@ -481,7 +481,7 @@ VIDEO_UPDATE( metlhawk ) int pri; UpdatePalette(); - fillbitmap( bitmap, get_black_pen(machine), cliprect ); + fillbitmap( bitmap, get_black_pen(screen->machine), cliprect ); ApplyClip( &clip, cliprect ); for( pri=0; pri<16; pri++ ) @@ -491,7 +491,7 @@ VIDEO_UPDATE( metlhawk ) namco_tilemap_draw( bitmap, &clip, pri/2 ); } namco_roz_draw( bitmap, &clip, pri ); - namcos2_draw_sprites_metalhawk(machine, bitmap,&clip,pri ); + namcos2_draw_sprites_metalhawk(screen->machine, bitmap,&clip,pri ); } return 0; } diff --git a/src/mame/video/namcos21.c b/src/mame/video/namcos21.c index 21a7300df70..d0e2ef14f2e 100644 --- a/src/mame/video/namcos21.c +++ b/src/mame/video/namcos21.c @@ -186,15 +186,15 @@ VIDEO_UPDATE( namcos21 ) if( namcos2_gametype != NAMCOS21_WINRUN91 ) { /* draw low priority 2d sprites */ - namco_obj_draw( machine, bitmap, cliprect, 2 ); + namco_obj_draw(screen->machine, bitmap, cliprect, 2 ); } CopyVisiblePolyFrameBuffer( bitmap, cliprect,0x7fc0,0x7ffe ); if( namcos2_gametype != NAMCOS21_WINRUN91 ) { /* draw low priority 2d sprites */ - namco_obj_draw( machine, bitmap, cliprect, 0 ); - namco_obj_draw( machine, bitmap, cliprect, 1 ); + namco_obj_draw(screen->machine, bitmap, cliprect, 0 ); + namco_obj_draw(screen->machine, bitmap, cliprect, 1 ); } CopyVisiblePolyFrameBuffer( bitmap, cliprect,0,0x7fbf ); @@ -204,7 +204,7 @@ VIDEO_UPDATE( namcos21 ) { /* draw high priority 2d sprites */ for( pri=pivot; pri<8; pri++ ) { - namco_obj_draw( machine, bitmap, cliprect, pri ); + namco_obj_draw(screen->machine, bitmap, cliprect, pri ); } } else diff --git a/src/mame/video/namcos22.c b/src/mame/video/namcos22.c index d1ad6747637..65429faf07d 100644 --- a/src/mame/video/namcos22.c +++ b/src/mame/video/namcos22.c @@ -2268,11 +2268,11 @@ VIDEO_UPDATE( namcos22s ) UpdateVideoMixer(); bgColor = (mixer.rBackColor<<16)|(mixer.gBackColor<<8)|mixer.bBackColor; fillbitmap( bitmap, bgColor, cliprect ); - UpdatePaletteS(machine); - DrawCharacterLayer(machine, bitmap, cliprect ); + UpdatePaletteS(screen->machine); + DrawCharacterLayer(screen->machine, bitmap, cliprect ); DrawPolygons( bitmap ); DrawSprites( bitmap, cliprect ); - RenderScene(machine, bitmap ); + RenderScene(screen->machine, bitmap ); DrawTranslucentCharacters( bitmap, cliprect ); ApplyGamma( bitmap ); @@ -2316,11 +2316,11 @@ VIDEO_UPDATE( namcos22s ) VIDEO_UPDATE( namcos22 ) { UpdateVideoMixer(); - fillbitmap( bitmap, get_black_pen(machine), cliprect ); - UpdatePalette(machine); - DrawCharacterLayer(machine, bitmap, cliprect ); + fillbitmap( bitmap, get_black_pen(screen->machine), cliprect ); + UpdatePalette(screen->machine); + DrawCharacterLayer(screen->machine, bitmap, cliprect ); DrawPolygons( bitmap ); - RenderScene(machine, bitmap); + RenderScene(screen->machine, bitmap); DrawTranslucentCharacters( bitmap, cliprect ); ApplyGamma( bitmap ); diff --git a/src/mame/video/namcos86.c b/src/mame/video/namcos86.c index 30f16aa3c76..90bc38ab223 100644 --- a/src/mame/video/namcos86.c +++ b/src/mame/video/namcos86.c @@ -360,7 +360,7 @@ VIDEO_UPDATE( namcos86 ) fillbitmap(priority_bitmap, 0, cliprect); - fillbitmap(bitmap,machine->gfx[0]->color_base + 8*backcolor+7,cliprect); + fillbitmap(bitmap,screen->machine->gfx[0]->color_base + 8*backcolor+7,cliprect); for (layer = 0;layer < 8;layer++) { @@ -373,7 +373,7 @@ VIDEO_UPDATE( namcos86 ) } } - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/naughtyb.c b/src/mame/video/naughtyb.c index 6f2fc0c61e5..d0d70e574d7 100644 --- a/src/mame/video/naughtyb.c +++ b/src/mame/video/naughtyb.c @@ -229,14 +229,14 @@ VIDEO_UPDATE( naughtyb ) } } - drawgfx(tmpbitmap,machine->gfx[0], + drawgfx(tmpbitmap,screen->machine->gfx[0], naughtyb_videoram2[offs] + 256 * bankreg, (naughtyb_videoram2[offs] >> 5) + 8 * palreg, naughtyb_cocktail,naughtyb_cocktail, 8*sx,8*sy, 0,TRANSPARENCY_NONE,0); - drawgfx(tmpbitmap,machine->gfx[1], + drawgfx(tmpbitmap,screen->machine->gfx[1], videoram[offs] + 256*bankreg, (videoram[offs] >> 5) + 8 * palreg, naughtyb_cocktail,naughtyb_cocktail, diff --git a/src/mame/video/nbmj8688.c b/src/mame/video/nbmj8688.c index 2db59770dd5..819a0fbec5f 100644 --- a/src/mame/video/nbmj8688.c +++ b/src/mame/video/nbmj8688.c @@ -712,9 +712,9 @@ VIDEO_UPDATE( mbmj8688_LCD ) { int x, y, b; - if(screen==0) VIDEO_UPDATE_CALL(mbmj8688); + if(scrnum==0) VIDEO_UPDATE_CALL(mbmj8688); - if (screen==1) + if (scrnum==1) { for (y = 0;y < 64;y++) { @@ -728,7 +728,7 @@ VIDEO_UPDATE( mbmj8688_LCD ) } } - if (screen==2) + if (scrnum==2) { for (y = 0;y < 64;y++) { diff --git a/src/mame/video/nbmj8891.c b/src/mame/video/nbmj8891.c index 76c0576267e..7a17ef22c46 100644 --- a/src/mame/video/nbmj8891.c +++ b/src/mame/video/nbmj8891.c @@ -527,18 +527,18 @@ VIDEO_UPDATE( nbmj8891 ) if (nbmj8891_screen_refresh) { nbmj8891_screen_refresh = 0; - for (y = 0; y < machine->screen[0].height; y++) + for (y = 0; y < screen->machine->screen[0].height; y++) { - for (x = 0; x < machine->screen[0].width; x++) + for (x = 0; x < screen->machine->screen[0].width; x++) { update_pixel0(x, y); } } if (gfxdraw_mode) { - for (y = 0; y < machine->screen[0].height; y++) + for (y = 0; y < screen->machine->screen[0].height; y++) { - for (x = 0; x < machine->screen[0].width; x++) + for (x = 0; x < screen->machine->screen[0].width; x++) { update_pixel1(x, y); } diff --git a/src/mame/video/nbmj8991.c b/src/mame/video/nbmj8991.c index b5ac933ee46..63b7835d93b 100644 --- a/src/mame/video/nbmj8991.c +++ b/src/mame/video/nbmj8991.c @@ -311,9 +311,9 @@ VIDEO_UPDATE( nbmj8991_type1 ) { nbmj8991_screen_refresh = 0; - for (y = 0; y < machine->screen[0].height; y++) + for (y = 0; y < screen->machine->screen[0].height; y++) { - for (x = 0; x < machine->screen[0].width; x++) + for (x = 0; x < screen->machine->screen[0].width; x++) { update_pixel(x, y); } @@ -351,9 +351,9 @@ VIDEO_UPDATE( nbmj8991_type2 ) { nbmj8991_screen_refresh = 0; - for (y = 0; y < machine->screen[0].height; y++) + for (y = 0; y < screen->machine->screen[0].height; y++) { - for (x = 0; x < machine->screen[0].width; x++) + for (x = 0; x < screen->machine->screen[0].width; x++) { update_pixel(x, y); } diff --git a/src/mame/video/nbmj9195.c b/src/mame/video/nbmj9195.c index 4f3e06b7d40..8b55a0cac37 100644 --- a/src/mame/video/nbmj9195.c +++ b/src/mame/video/nbmj9195.c @@ -465,9 +465,9 @@ VIDEO_UPDATE( nbmj9195 ) { nbmj9195_screen_refresh = 0; - for (y = 0; y < machine->screen[0].height; y++) + for (y = 0; y < screen->machine->screen[0].height; y++) { - for (x = 0; x < machine->screen[0].width; x++) + for (x = 0; x < screen->machine->screen[0].width; x++) { update_pixel(0, x, y); diff --git a/src/mame/video/nemesis.c b/src/mame/video/nemesis.c index 0461843f79e..6cbf53bd11c 100644 --- a/src/mame/video/nemesis.c +++ b/src/mame/video/nemesis.c @@ -385,7 +385,7 @@ VIDEO_UPDATE( nemesis ) { int offs; - update_gfx(machine); + update_gfx(screen->machine); fillbitmap(priority_bitmap,0,cliprect); fillbitmap(bitmap,0,cliprect); @@ -405,7 +405,7 @@ VIDEO_UPDATE( nemesis ) tilemap_draw(bitmap,cliprect,background,1,4); tilemap_draw(bitmap,cliprect,foreground,1,8); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } @@ -414,7 +414,7 @@ VIDEO_UPDATE( salamand ) int offs; rectangle clip; - update_gfx(machine); + update_gfx(screen->machine); fillbitmap(priority_bitmap,0,cliprect); fillbitmap(bitmap,0,cliprect); @@ -449,6 +449,6 @@ VIDEO_UPDATE( salamand ) tilemap_draw(bitmap,&clip,background,1,8); } - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/ninjaw.c b/src/mame/video/ninjaw.c index 19695259012..37629bbc460 100644 --- a/src/mame/video/ninjaw.c +++ b/src/mame/video/ninjaw.c @@ -147,11 +147,11 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( ninjaw ) { - int xoffs = 36*8*screen; + int xoffs = 36*8*scrnum; UINT8 layer[3], nodraw; - TC0100SCN_tilemap_update(machine); + TC0100SCN_tilemap_update(screen->machine); layer[0] = TC0100SCN_bottomlayer(0); layer[1] = layer[0]^1; @@ -159,20 +159,20 @@ VIDEO_UPDATE( ninjaw ) /* chip 0 does tilemaps on the left, chip 1 center, chip 2 the right */ // draw bottom layer - nodraw = TC0100SCN_tilemap_draw(machine,bitmap,cliprect,screen,layer[0],TILEMAP_DRAW_OPAQUE,0); /* left */ + nodraw = TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,scrnum,layer[0],TILEMAP_DRAW_OPAQUE,0); /* left */ /* Ensure screen blanked even when bottom layers not drawn due to disable bit */ - if (nodraw) fillbitmap(bitmap, get_black_pen(machine), cliprect); + if (nodraw) fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); /* Sprites can be under/over the layer below text layer */ - draw_sprites(machine,bitmap,cliprect,1,xoffs,8); // draw sprites with priority 1 which are under the mid layer + draw_sprites(screen->machine,bitmap,cliprect,1,xoffs,8); // draw sprites with priority 1 which are under the mid layer // draw middle layer - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,screen,layer[1],0,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,scrnum,layer[1],0,0); - draw_sprites(machine,bitmap,cliprect,0,xoffs,8); // draw sprites with priority 0 which are over the mid layer + draw_sprites(screen->machine,bitmap,cliprect,0,xoffs,8); // draw sprites with priority 0 which are over the mid layer // draw top(text) layer - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,screen,layer[2],0,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,scrnum,layer[2],0,0); return 0; } diff --git a/src/mame/video/niyanpai.c b/src/mame/video/niyanpai.c index e5c24ac5c45..365ee33d431 100644 --- a/src/mame/video/niyanpai.c +++ b/src/mame/video/niyanpai.c @@ -408,9 +408,9 @@ VIDEO_UPDATE( niyanpai ) { niyanpai_screen_refresh = 0; - for (y = 0; y < machine->screen[0].height; y++) + for (y = 0; y < screen->machine->screen[0].height; y++) { - for (x = 0; x < machine->screen[0].width; x++) + for (x = 0; x < screen->machine->screen[0].width; x++) { update_pixel(0, x, y); update_pixel(1, x, y); diff --git a/src/mame/video/nmk16.c b/src/mame/video/nmk16.c index 6a7716fe892..045c64807d2 100644 --- a/src/mame/video/nmk16.c +++ b/src/mame/video/nmk16.c @@ -544,10 +544,10 @@ VIDEO_UPDATE( macross ) tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - nmk16_draw_sprites(machine, bitmap,cliprect,3); - nmk16_draw_sprites(machine, bitmap,cliprect,2); - nmk16_draw_sprites(machine, bitmap,cliprect,1); - nmk16_draw_sprites(machine, bitmap,cliprect,0); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,3); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,2); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,1); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; @@ -685,10 +685,10 @@ VIDEO_UPDATE( tdragon ) tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - nmk16_draw_sprites(machine, bitmap,cliprect,3); - nmk16_draw_sprites(machine, bitmap,cliprect,2); - nmk16_draw_sprites(machine, bitmap,cliprect,1); - nmk16_draw_sprites(machine, bitmap,cliprect,0); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,3); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,2); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,1); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; @@ -702,10 +702,10 @@ VIDEO_UPDATE( hachamf ) tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - nmk16_draw_sprites(machine, bitmap,cliprect,3); - nmk16_draw_sprites(machine, bitmap,cliprect,2); - nmk16_draw_sprites(machine, bitmap,cliprect,1); - nmk16_draw_sprites(machine, bitmap,cliprect,0); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,3); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,2); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,1); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; @@ -717,10 +717,10 @@ VIDEO_UPDATE( manybloc ) tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - nmk16_draw_sprites_flipsupported(machine, bitmap,cliprect,3); - nmk16_draw_sprites_flipsupported(machine, bitmap,cliprect,2); - nmk16_draw_sprites_flipsupported(machine, bitmap,cliprect,1); - nmk16_draw_sprites_flipsupported(machine, bitmap,cliprect,0); + nmk16_draw_sprites_flipsupported(screen->machine, bitmap,cliprect,3); + nmk16_draw_sprites_flipsupported(screen->machine, bitmap,cliprect,2); + nmk16_draw_sprites_flipsupported(screen->machine, bitmap,cliprect,1); + nmk16_draw_sprites_flipsupported(screen->machine, bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; @@ -735,10 +735,10 @@ VIDEO_UPDATE( tharrier ) tilemap_set_scrollx(bg_tilemap,0,tharrier_scroll); tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - nmk16_draw_sprites_flipsupported(machine, bitmap,cliprect,3); - nmk16_draw_sprites_flipsupported(machine, bitmap,cliprect,2); - nmk16_draw_sprites_flipsupported(machine, bitmap,cliprect,1); - nmk16_draw_sprites_flipsupported(machine, bitmap,cliprect,0); + nmk16_draw_sprites_flipsupported(screen->machine, bitmap,cliprect,3); + nmk16_draw_sprites_flipsupported(screen->machine, bitmap,cliprect,2); + nmk16_draw_sprites_flipsupported(screen->machine, bitmap,cliprect,1); + nmk16_draw_sprites_flipsupported(screen->machine, bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; @@ -778,7 +778,7 @@ VIDEO_UPDATE( bioship ) int numtile = data&0xfff; int color = (data&0xf000)>>12; - drawgfx(background_bitmap,machine->gfx[3], + drawgfx(background_bitmap,screen->machine->gfx[3], numtile, color, 0,0, /* no flip */ @@ -788,7 +788,7 @@ VIDEO_UPDATE( bioship ) data = tilerom[offs+0x1000+bank]; numtile = data&0xfff; color = (data&0xf000)>>12; - drawgfx(background_bitmap,machine->gfx[3], + drawgfx(background_bitmap,screen->machine->gfx[3], numtile, color, 0,0, /* no flip */ @@ -803,10 +803,10 @@ VIDEO_UPDATE( bioship ) copyscrollbitmap(bitmap,background_bitmap,1,&scrollx,1,&scrolly,cliprect); tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - nmk16_draw_sprites(machine, bitmap,cliprect,3); - nmk16_draw_sprites(machine, bitmap,cliprect,2); - nmk16_draw_sprites(machine, bitmap,cliprect,1); - nmk16_draw_sprites(machine, bitmap,cliprect,0); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,3); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,2); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,1); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; @@ -819,10 +819,10 @@ VIDEO_UPDATE( strahl ) tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); - nmk16_draw_sprites(machine, bitmap,cliprect,3); - nmk16_draw_sprites(machine, bitmap,cliprect,2); - nmk16_draw_sprites(machine, bitmap,cliprect,1); - nmk16_draw_sprites(machine, bitmap,cliprect,0); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,3); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,2); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,1); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; @@ -834,10 +834,10 @@ VIDEO_UPDATE( bjtwin ) tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - nmk16_draw_sprites(machine, bitmap,cliprect,3); - nmk16_draw_sprites(machine, bitmap,cliprect,2); - nmk16_draw_sprites(machine, bitmap,cliprect,1); - nmk16_draw_sprites(machine, bitmap,cliprect,0); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,3); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,2); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,1); + nmk16_draw_sprites(screen->machine, bitmap,cliprect,0); return 0; } @@ -1073,9 +1073,9 @@ static void video_update(running_machine *machine, bitmap_t *bitmap, const recta tilemap_draw(bitmap,cliprect,tilemap_1,0,0); } -VIDEO_UPDATE( afega ) { video_update(machine,bitmap,cliprect, 1, -0x100,+0x000, 0x0001); return 0; } -VIDEO_UPDATE( bubl2000 ) { video_update(machine,bitmap,cliprect, 0, -0x100,+0x000, 0x0001); return 0; } // no flipscreen support, I really would confirmation from the schematics -VIDEO_UPDATE( redhawkb ) { video_update(machine,bitmap,cliprect, 0, +0x000,+0x100, 0x0001); return 0; } +VIDEO_UPDATE( afega ) { video_update(screen->machine,bitmap,cliprect, 1, -0x100,+0x000, 0x0001); return 0; } +VIDEO_UPDATE( bubl2000 ) { video_update(screen->machine,bitmap,cliprect, 0, -0x100,+0x000, 0x0001); return 0; } // no flipscreen support, I really would confirmation from the schematics +VIDEO_UPDATE( redhawkb ) { video_update(screen->machine,bitmap,cliprect, 0, +0x000,+0x100, 0x0001); return 0; } VIDEO_UPDATE( firehawk ) { @@ -1086,10 +1086,10 @@ VIDEO_UPDATE( firehawk ) tilemap_draw(bitmap,cliprect,tilemap_0,0,0); - nmk16_draw_sprites_flipsupported(machine, bitmap,cliprect,3); - nmk16_draw_sprites_flipsupported(machine, bitmap,cliprect,2); - nmk16_draw_sprites_flipsupported(machine, bitmap,cliprect,1); - nmk16_draw_sprites_flipsupported(machine, bitmap,cliprect,0); + nmk16_draw_sprites_flipsupported(screen->machine, bitmap,cliprect,3); + nmk16_draw_sprites_flipsupported(screen->machine, bitmap,cliprect,2); + nmk16_draw_sprites_flipsupported(screen->machine, bitmap,cliprect,1); + nmk16_draw_sprites_flipsupported(screen->machine, bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,tilemap_1,0,0); return 0; diff --git a/src/mame/video/nova2001.c b/src/mame/video/nova2001.c index 3cc364e231d..a6197754cd2 100644 --- a/src/mame/video/nova2001.c +++ b/src/mame/video/nova2001.c @@ -345,7 +345,7 @@ VIDEO_UPDATE( nova2001 ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - nova2001_draw_sprites(machine, bitmap, cliprect); + nova2001_draw_sprites(screen->machine, bitmap, cliprect); // according to the schematics, fg category 0 should be drawn behind sprites, // but it doesn't look right that way @@ -360,7 +360,7 @@ VIDEO_UPDATE( pkunwar ) tilemap_draw(bitmap, cliprect, bg_tilemap, TILEMAP_DRAW_OPAQUE | 0, 0); tilemap_draw(bitmap, cliprect, bg_tilemap, TILEMAP_DRAW_OPAQUE | 1, 0); - pkunwar_draw_sprites(machine, bitmap, cliprect); + pkunwar_draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, bg_tilemap, 1, 0); @@ -373,7 +373,7 @@ VIDEO_UPDATE( ninjakun ) tilemap_draw(bitmap, cliprect, fg_tilemap, 1, 0); - nova2001_draw_sprites(machine, bitmap, cliprect); + nova2001_draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); @@ -384,7 +384,7 @@ VIDEO_UPDATE( raiders5 ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - pkunwar_draw_sprites(machine, bitmap, cliprect); + pkunwar_draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); diff --git a/src/mame/video/nycaptor.c b/src/mame/video/nycaptor.c index b5451c8cf8c..4404daf3a4a 100644 --- a/src/mame/video/nycaptor.c +++ b/src/mame/video/nycaptor.c @@ -239,14 +239,14 @@ VIDEO_UPDATE( nycaptor ) tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0|1,0); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1|0,0); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0|0,0); - draw_sprites(machine, bitmap,cliprect,0); - draw_sprites(machine, bitmap,cliprect,1); - draw_sprites(machine, bitmap,cliprect,2); - draw_sprites(machine, bitmap,cliprect,3); - draw_sprites(machine, bitmap,cliprect,4); - draw_sprites(machine, bitmap,cliprect,5); - draw_sprites(machine, bitmap,cliprect,6); - draw_sprites(machine, bitmap,cliprect,7); + draw_sprites(screen->machine, bitmap,cliprect,0); + draw_sprites(screen->machine, bitmap,cliprect,1); + draw_sprites(screen->machine, bitmap,cliprect,2); + draw_sprites(screen->machine, bitmap,cliprect,3); + draw_sprites(screen->machine, bitmap,cliprect,4); + draw_sprites(screen->machine, bitmap,cliprect,5); + draw_sprites(screen->machine, bitmap,cliprect,6); + draw_sprites(screen->machine, bitmap,cliprect,7); } else #endif @@ -254,31 +254,31 @@ VIDEO_UPDATE( nycaptor ) { case 0: tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1|3,0); - draw_sprites(machine, bitmap,cliprect,6); + draw_sprites(screen->machine, bitmap,cliprect,6); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0|3,0); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1|2,0); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0|2,0); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1|1,0); - draw_sprites(machine, bitmap,cliprect,3); + draw_sprites(screen->machine, bitmap,cliprect,3); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0|1,0); - draw_sprites(machine, bitmap,cliprect,0); - draw_sprites(machine, bitmap,cliprect,2); + draw_sprites(screen->machine, bitmap,cliprect,0); + draw_sprites(screen->machine, bitmap,cliprect,2); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1|0,0); - draw_sprites(machine, bitmap,cliprect,1); + draw_sprites(screen->machine, bitmap,cliprect,1); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0|0,0); break; case 1: tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1|3,0); - draw_sprites(machine, bitmap,cliprect,3); + draw_sprites(screen->machine, bitmap,cliprect,3); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0|3,0); - draw_sprites(machine, bitmap,cliprect,2); + draw_sprites(screen->machine, bitmap,cliprect,2); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1|2,0); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1|1,0); - draw_sprites(machine, bitmap,cliprect,1); + draw_sprites(screen->machine, bitmap,cliprect,1); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0|1,0); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0|2,0); - draw_sprites(machine, bitmap,cliprect,0); + draw_sprites(screen->machine, bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1|0,0); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0|0,0); break; @@ -287,20 +287,20 @@ VIDEO_UPDATE( nycaptor ) tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1|3,0); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0|3,0); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1|1,0); - draw_sprites(machine, bitmap,cliprect,1); + draw_sprites(screen->machine, bitmap,cliprect,1); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0|1,0); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1|2,0); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0|2,0); - draw_sprites(machine, bitmap,cliprect,0); + draw_sprites(screen->machine, bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1|0,0); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0|0,0); break; case 3: tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1|1,0); - draw_sprites(machine, bitmap,cliprect,1); + draw_sprites(screen->machine, bitmap,cliprect,1); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0|1,0); - draw_sprites(machine, bitmap,cliprect,0); + draw_sprites(screen->machine, bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1|0,0); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0|0,0); break; diff --git a/src/mame/video/offtwall.c b/src/mame/video/offtwall.c index d382aafdf06..915311e4885 100644 --- a/src/mame/video/offtwall.c +++ b/src/mame/video/offtwall.c @@ -97,7 +97,7 @@ VIDEO_UPDATE( offtwall ) tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); /* draw and merge the MO */ - mobitmap = atarimo_render(machine, 0, cliprect, &rectlist); + mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) { diff --git a/src/mame/video/ohmygod.c b/src/mame/video/ohmygod.c index 66acfcb6b13..efeb7b98af5 100644 --- a/src/mame/video/ohmygod.c +++ b/src/mame/video/ohmygod.c @@ -109,6 +109,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( ohmygod ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/ojankohs.c b/src/mame/video/ojankohs.c index 70c91c00f78..229d01d23f5 100644 --- a/src/mame/video/ojankohs.c +++ b/src/mame/video/ojankohs.c @@ -324,7 +324,7 @@ VIDEO_UPDATE( ojankoc ) { /* redraw bitmap */ for (offs = 0; offs < 0x8000; offs++) { - ojankoc_videoram_w(machine, offs, ojankohs_videoram[offs]); + ojankoc_videoram_w(screen->machine, offs, ojankohs_videoram[offs]); } ojankoc_screen_refresh = 0; } diff --git a/src/mame/video/oneshot.c b/src/mame/video/oneshot.c index 7f7dc4e6035..2fbe46af974 100644 --- a/src/mame/video/oneshot.c +++ b/src/mame/video/oneshot.c @@ -168,14 +168,14 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( oneshot ) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); tilemap_set_scrollx(oneshot_mid_tilemap,0, oneshot_scroll[0]-0x1f5); tilemap_set_scrolly(oneshot_mid_tilemap,0, oneshot_scroll[1]); tilemap_draw(bitmap,cliprect,oneshot_bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,oneshot_mid_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,oneshot_fg_tilemap,0,0); draw_crosshairs(bitmap,cliprect); return 0; @@ -183,14 +183,14 @@ VIDEO_UPDATE( oneshot ) VIDEO_UPDATE( maddonna ) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); tilemap_set_scrolly(oneshot_mid_tilemap,0, oneshot_scroll[1]); // other registers aren't used so we don't know which layers they relate to tilemap_draw(bitmap,cliprect,oneshot_mid_tilemap,0,0); tilemap_draw(bitmap,cliprect,oneshot_fg_tilemap,0,0); tilemap_draw(bitmap,cliprect,oneshot_bg_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); // draw_crosshairs(bitmap,cliprect); // not a gun game // popmessage ("%04x %04x %04x %04x %04x %04x %04x %04x", oneshot_scroll[0],oneshot_scroll[1],oneshot_scroll[2],oneshot_scroll[3],oneshot_scroll[4],oneshot_scroll[5],oneshot_scroll[6],oneshot_scroll[7]); diff --git a/src/mame/video/orbit.c b/src/mame/video/orbit.c index 3ffce7a0f3c..a8a3e0562ec 100644 --- a/src/mame/video/orbit.c +++ b/src/mame/video/orbit.c @@ -104,6 +104,6 @@ VIDEO_UPDATE( orbit ) tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/othldrby.c b/src/mame/video/othldrby.c index e8e60bef0d4..7ce686c78b5 100644 --- a/src/mame/video/othldrby.c +++ b/src/mame/video/othldrby.c @@ -203,16 +203,16 @@ VIDEO_UPDATE( othldrby ) for (layer = 0;layer < 3;layer++) tilemap_draw(bitmap,cliprect,bg_tilemap[layer],0,0); - draw_sprites(machine,bitmap,cliprect,0); + draw_sprites(screen->machine,bitmap,cliprect,0); for (layer = 0;layer < 3;layer++) tilemap_draw(bitmap,cliprect,bg_tilemap[layer],1,0); - draw_sprites(machine,bitmap,cliprect,1); + draw_sprites(screen->machine,bitmap,cliprect,1); for (layer = 0;layer < 3;layer++) tilemap_draw(bitmap,cliprect,bg_tilemap[layer],2,0); - draw_sprites(machine,bitmap,cliprect,2); + draw_sprites(screen->machine,bitmap,cliprect,2); for (layer = 0;layer < 3;layer++) tilemap_draw(bitmap,cliprect,bg_tilemap[layer],3,0); - draw_sprites(machine,bitmap,cliprect,3); + draw_sprites(screen->machine,bitmap,cliprect,3); return 0; } diff --git a/src/mame/video/othunder.c b/src/mame/video/othunder.c index 71576e20427..8b495660815 100644 --- a/src/mame/video/othunder.c +++ b/src/mame/video/othunder.c @@ -223,7 +223,7 @@ VIDEO_UPDATE( othunder ) { int layer[3]; - TC0100SCN_tilemap_update(machine); + TC0100SCN_tilemap_update(screen->machine); layer[0] = TC0100SCN_bottomlayer(0); layer[1] = layer[0]^1; @@ -234,14 +234,14 @@ VIDEO_UPDATE( othunder ) /* Ensure screen blanked even when bottom layer not drawn due to disable bit */ fillbitmap(bitmap, 0, cliprect); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,1); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[1],0,2); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[2],0,4); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,1); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[1],0,2); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[2],0,4); /* Sprites can be under/over the layer below text layer */ { static const int primasks[2] = {0xf0,0xfc}; - draw_sprites(machine, bitmap,cliprect,primasks,3); + draw_sprites(screen->machine, bitmap,cliprect,primasks,3); } return 0; diff --git a/src/mame/video/overdriv.c b/src/mame/video/overdriv.c index dff509c287e..635656909bc 100644 --- a/src/mame/video/overdriv.c +++ b/src/mame/video/overdriv.c @@ -82,6 +82,6 @@ VIDEO_UPDATE( overdriv ) K051316_zoom_draw_0(bitmap,cliprect,0,0); K051316_zoom_draw_1(bitmap,cliprect,0,1); - K053247_sprites_draw(machine, bitmap,cliprect); + K053247_sprites_draw(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/pacland.c b/src/mame/video/pacland.c index 98cce2d180c..5d7eb44c6dd 100644 --- a/src/mame/video/pacland.c +++ b/src/mame/video/pacland.c @@ -387,7 +387,7 @@ VIDEO_UPDATE( pacland ) wherever there is a high-priority pixel; note that we draw to the bitmap which is safe because the bg_tilemap draw will overwrite everything */ fillbitmap(priority_bitmap, 0x00, cliprect); - draw_sprites(machine, bitmap, cliprect, 0); + draw_sprites(screen->machine, bitmap, cliprect, 0); /* draw background */ tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); @@ -396,12 +396,12 @@ VIDEO_UPDATE( pacland ) draw_fg(bitmap, cliprect, 0); /* draw sprites with regular transparency */ - draw_sprites(machine, bitmap, cliprect, 1); + draw_sprites(screen->machine, bitmap, cliprect, 1); /* draw high priority fg tiles */ draw_fg(bitmap, cliprect, 1); /* draw sprite pixels with colortable values >= 0xf0, which have priority over everything */ - draw_sprites(machine, bitmap, cliprect, 2); + draw_sprites(screen->machine, bitmap, cliprect, 2); return 0; } diff --git a/src/mame/video/pacman.c b/src/mame/video/pacman.c index 133ec07a89b..a4db67fad1a 100644 --- a/src/mame/video/pacman.c +++ b/src/mame/video/pacman.c @@ -241,22 +241,22 @@ VIDEO_UPDATE( pacman ) sy = spriteram_2[offs] - 31; color = ( spriteram[offs + 1] & 0x1f ) | (colortablebank << 5) | (palettebank << 6 ); - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], ( spriteram[offs] >> 2 ) | (spritebank << 6), color, spriteram[offs] & 1,spriteram[offs] & 2, sx,sy, &spriteclip,TRANSPARENCY_PENS, - colortable_get_transpen_mask(machine->colortable, machine->gfx[1], color & 0x3f, 0)); + colortable_get_transpen_mask(screen->machine->colortable, screen->machine->gfx[1], color & 0x3f, 0)); /* also plot the sprite with wraparound (tunnel in Crush Roller) */ - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], ( spriteram[offs] >> 2 ) | (spritebank << 6), color, spriteram[offs] & 1,spriteram[offs] & 2, sx - 256,sy, &spriteclip,TRANSPARENCY_PENS, - colortable_get_transpen_mask(machine->colortable, machine->gfx[1], color & 0x3f, 0)); + colortable_get_transpen_mask(screen->machine->colortable, screen->machine->gfx[1], color & 0x3f, 0)); } /* In the Pac Man based games (NOT Pengo) the first two sprites must be offset */ /* one pixel to the left to get a more correct placement */ @@ -269,22 +269,22 @@ VIDEO_UPDATE( pacman ) sy = spriteram_2[offs] - 31; color = ( spriteram[offs + 1] & 0x1f ) | (colortablebank << 5) | (palettebank << 6 ); - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], ( spriteram[offs] >> 2 ) | (spritebank << 6), color, spriteram[offs] & 1,spriteram[offs] & 2, sx,sy + xoffsethack, &spriteclip,TRANSPARENCY_PENS, - colortable_get_transpen_mask(machine->colortable, machine->gfx[1], color & 0x3f, 0)); + colortable_get_transpen_mask(screen->machine->colortable, screen->machine->gfx[1], color & 0x3f, 0)); /* also plot the sprite with wraparound (tunnel in Crush Roller) */ - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], ( spriteram[offs] >> 2 ) | (spritebank << 6), color, spriteram[offs] & 2,spriteram[offs] & 1, sx - 256,sy + xoffsethack, &spriteclip,TRANSPARENCY_PENS, - colortable_get_transpen_mask(machine->colortable, machine->gfx[1], color & 0x3f, 0)); + colortable_get_transpen_mask(screen->machine->colortable, screen->machine->gfx[1], color & 0x3f, 0)); } } @@ -411,13 +411,13 @@ VIDEO_UPDATE( s2650games ) color = spriteram[offs + 1] & 0x1f; /* TODO: ?? */ - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], (spriteram[offs] >> 2) | ((s2650games_spriteram[offs] & 3) << 6), color, spriteram[offs] & 1,spriteram[offs] & 2, sx,sy, cliprect,TRANSPARENCY_PENS, - colortable_get_transpen_mask(machine->colortable, machine->gfx[1], color & 0x3f, 0)); + colortable_get_transpen_mask(screen->machine->colortable, screen->machine->gfx[1], color & 0x3f, 0)); } /* In the Pac Man based games (NOT Pengo) the first two sprites must be offset */ /* one pixel to the left to get a more correct placement */ @@ -432,13 +432,13 @@ VIDEO_UPDATE( s2650games ) color = spriteram[offs + 1] & 0x1f; /* TODO: ?? */ - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], (spriteram[offs] >> 2) | ((s2650games_spriteram[offs] & 3)<<6), color, spriteram[offs] & 1,spriteram[offs] & 2, sx,sy + xoffsethack, cliprect,TRANSPARENCY_PENS, - colortable_get_transpen_mask(machine->colortable, machine->gfx[1], color & 0x3f, 0)); + colortable_get_transpen_mask(screen->machine->colortable, screen->machine->gfx[1], color & 0x3f, 0)); } return 0; } diff --git a/src/mame/video/pandoras.c b/src/mame/video/pandoras.c index 4b0b93a6503..d13d7dfb90b 100644 --- a/src/mame/video/pandoras.c +++ b/src/mame/video/pandoras.c @@ -169,8 +169,8 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( pandoras ) { - tilemap_draw( bitmap,cliprect, layer0, 1 ,0); - draw_sprites( machine, bitmap,cliprect, &spriteram[0x800] ); - tilemap_draw( bitmap,cliprect, layer0, 0 ,0); + tilemap_draw(bitmap,cliprect, layer0, 1 ,0); + draw_sprites(screen->machine, bitmap,cliprect, &spriteram[0x800] ); + tilemap_draw(bitmap,cliprect, layer0, 0 ,0); return 0; } diff --git a/src/mame/video/paradise.c b/src/mame/video/paradise.c index eec9d9809bc..becc920927a 100644 --- a/src/mame/video/paradise.c +++ b/src/mame/video/paradise.c @@ -249,13 +249,13 @@ if (input_code_pressed(KEYCODE_Z)) } #endif - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); if (!(paradise_priority & 4)) /* Screen blanking */ return 0; if (paradise_priority & 1) - if (layers_ctrl&16) draw_sprites(machine,bitmap,cliprect); + if (layers_ctrl&16) draw_sprites(screen->machine,bitmap,cliprect); if (layers_ctrl&1) tilemap_draw(bitmap,cliprect, tilemap_0, 0,0); if (layers_ctrl&2) tilemap_draw(bitmap,cliprect, tilemap_1, 0,0); @@ -264,14 +264,14 @@ if (input_code_pressed(KEYCODE_Z)) if (paradise_priority & 2) { if (!(paradise_priority & 1)) - if (layers_ctrl&16) draw_sprites(machine, bitmap,cliprect); + if (layers_ctrl&16) draw_sprites(screen->machine, bitmap,cliprect); if (layers_ctrl&8) tilemap_draw(bitmap,cliprect, tilemap_2, 0,0); } else { if (layers_ctrl&8) tilemap_draw(bitmap,cliprect, tilemap_2, 0,0); if (!(paradise_priority & 1)) - if (layers_ctrl&16) draw_sprites(machine, bitmap,cliprect); + if (layers_ctrl&16) draw_sprites(screen->machine, bitmap,cliprect); } return 0; } @@ -279,20 +279,20 @@ if (input_code_pressed(KEYCODE_Z)) /* no pix layer, no tilemap_0, different priority bits */ VIDEO_UPDATE( torus ) { - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); if (!(paradise_priority & 2)) /* Screen blanking */ return 0; if (paradise_priority & 1) - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect, tilemap_1, 0,0); if(paradise_priority & 4) { if (!(paradise_priority & 1)) - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect, tilemap_2, 0,0); } @@ -301,7 +301,7 @@ VIDEO_UPDATE( torus ) tilemap_draw(bitmap,cliprect, tilemap_2, 0,0); if (!(paradise_priority & 1)) - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); } return 0; } @@ -309,11 +309,11 @@ VIDEO_UPDATE( torus ) /* I don't know how the priority bits work on this one */ VIDEO_UPDATE( madball ) { - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); tilemap_draw(bitmap,cliprect, tilemap_0, 0,0); tilemap_draw(bitmap,cliprect, tilemap_1, 0,0); tilemap_draw(bitmap,cliprect, tilemap_2, 0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/pastelg.c b/src/mame/video/pastelg.c index 2f6bcdfdcf9..aad8928562f 100644 --- a/src/mame/video/pastelg.c +++ b/src/mame/video/pastelg.c @@ -267,9 +267,9 @@ VIDEO_UPDATE( pastelg ) { int x, y; - for (y = 0; y < machine->screen[0].height; y++) - for (x = 0; x < machine->screen[0].width; x++) - *BITMAP_ADDR16(bitmap, y, x) = pastelg_videoram[(y * machine->screen[0].width) + x]; + for (y = 0; y < screen->machine->screen[0].height; y++) + for (x = 0; x < screen->machine->screen[0].width; x++) + *BITMAP_ADDR16(bitmap, y, x) = pastelg_videoram[(y * screen->machine->screen[0].width) + x]; } else fillbitmap(bitmap, 0, cliprect); diff --git a/src/mame/video/pbaction.c b/src/mame/video/pbaction.c index 77673f3c4de..62d85d49102 100644 --- a/src/mame/video/pbaction.c +++ b/src/mame/video/pbaction.c @@ -128,7 +128,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( pbaction ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/pcktgal.c b/src/mame/video/pcktgal.c index 56f4a214fdc..447d4b98d05 100644 --- a/src/mame/video/pcktgal.c +++ b/src/mame/video/pcktgal.c @@ -95,6 +95,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( pcktgal ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/pgm.c b/src/mame/video/pgm.c index 83a6adc161d..488fd3ba8dc 100644 --- a/src/mame/video/pgm.c +++ b/src/mame/video/pgm.c @@ -325,7 +325,7 @@ VIDEO_UPDATE( pgm ) { int y; - fillbitmap(bitmap,get_black_pen(machine),&machine->screen[0].visarea); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); pgm_sprite_source = pgm_spritebufferram; draw_sprites(1, bitmap); diff --git a/src/mame/video/pingpong.c b/src/mame/video/pingpong.c index 6ab39d0ffd3..c93f7889327 100644 --- a/src/mame/video/pingpong.c +++ b/src/mame/video/pingpong.c @@ -150,6 +150,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( pingpong ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/pirates.c b/src/mame/video/pirates.c index bd2d9f1ff5c..23132ef289b 100644 --- a/src/mame/video/pirates.c +++ b/src/mame/video/pirates.c @@ -111,7 +111,7 @@ VIDEO_UPDATE(pirates) tilemap_set_scrollx(fg_tilemap,0,pirates_scroll[0]); tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; } diff --git a/src/mame/video/pitnrun.c b/src/mame/video/pitnrun.c index de156f3184d..80e113d15f5 100644 --- a/src/mame/video/pitnrun.c +++ b/src/mame/video/pitnrun.c @@ -277,7 +277,7 @@ VIDEO_UPDATE( pitnrun ) tilemap_draw(bitmap,&myclip,bg, 0,0); } - draw_sprites(machine,bitmap,&myclip); + draw_sprites(screen->machine,bitmap,&myclip); if(pitnrun_ha&4) copybitmap_trans(bitmap,tmp_bitmap[pitnrun_ha&3],flip_screen_x_get(),flip_screen_y_get(),dx,dy,&myclip, 1); diff --git a/src/mame/video/pktgaldx.c b/src/mame/video/pktgaldx.c index 77381227813..4543b9f98d8 100644 --- a/src/mame/video/pktgaldx.c +++ b/src/mame/video/pktgaldx.c @@ -92,7 +92,7 @@ VIDEO_UPDATE(pktgaldx) fillbitmap(priority_bitmap,0,NULL); deco16_tilemap_2_draw(bitmap,cliprect,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); deco16_tilemap_1_draw(bitmap,cliprect,0,0); return 0; } @@ -109,7 +109,7 @@ VIDEO_UPDATE(pktgaldb) int tileno; int colour; - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); /* the bootleg seems to treat the tilemaps as sprites */ for (offset = 0;offset<0x1600/2;offset+=8) @@ -123,7 +123,7 @@ VIDEO_UPDATE(pktgaldb) y&=0x1ff; y-=8; - drawgfx(bitmap,machine->gfx[0],tileno^0x1000,colour,0,0,x,y,cliprect,TRANSPARENCY_PEN,0); + drawgfx(bitmap,screen->machine->gfx[0],tileno^0x1000,colour,0,0,x,y,cliprect,TRANSPARENCY_PEN,0); } for (offset = 0x1600/2;offset<0x2000/2;offset+=8) @@ -137,7 +137,7 @@ VIDEO_UPDATE(pktgaldb) y&=0x1ff; y-=8; - drawgfx(bitmap,machine->gfx[0],tileno^0x4000,colour,0,0,x,y,cliprect,TRANSPARENCY_PEN,0); + drawgfx(bitmap,screen->machine->gfx[0],tileno^0x4000,colour,0,0,x,y,cliprect,TRANSPARENCY_PEN,0); } for (offset = 0x2000/2;offset<0x4000/2;offset+=8) @@ -151,7 +151,7 @@ VIDEO_UPDATE(pktgaldb) y&=0x1ff; y-=8; - drawgfx(bitmap,machine->gfx[0],tileno^0x3000,colour,0,0,x,y,cliprect,TRANSPARENCY_PEN,0); + drawgfx(bitmap,screen->machine->gfx[0],tileno^0x3000,colour,0,0,x,y,cliprect,TRANSPARENCY_PEN,0); } return 0; diff --git a/src/mame/video/playch10.c b/src/mame/video/playch10.c index 3c4c2dc1de0..6139dd8fada 100644 --- a/src/mame/video/playch10.c +++ b/src/mame/video/playch10.c @@ -121,7 +121,7 @@ VIDEO_UPDATE( playch10 ) /* if the bit is not set, then we should display */ /* the PPU portion. */ - if ( screen == 0 ) + if ( scrnum == 0 ) { if ( !pc10_dispmask ) { @@ -143,7 +143,7 @@ VIDEO_UPDATE( playch10 ) } else /* Single Monitor version */ { - rectangle top_monitor = machine->screen[0].visarea; + rectangle top_monitor = screen->machine->screen[0].visarea; top_monitor.max_y = ( top_monitor.max_y - top_monitor.min_y ) / 2; diff --git a/src/mame/video/playmark.c b/src/mame/video/playmark.c index ce42255e9f5..7a2ded1f76f 100644 --- a/src/mame/video/playmark.c +++ b/src/mame/video/playmark.c @@ -416,7 +416,7 @@ VIDEO_UPDATE( bigtwin ) tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); if (bg_enable) draw_bitmap(bitmap, cliprect); - draw_sprites(machine, bitmap,cliprect,4); + draw_sprites(screen->machine, bitmap,cliprect,4); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; } @@ -429,7 +429,7 @@ VIDEO_UPDATE( excelsr ) if (bg_enable) draw_bitmap(bitmap, cliprect); tilemap_draw(bitmap,cliprect,tx_tilemap,0,4); - draw_sprites(machine,bitmap,cliprect,2); + draw_sprites(screen->machine,bitmap,cliprect,2); return 0; } @@ -453,7 +453,7 @@ VIDEO_UPDATE( wbeachvl ) tilemap_draw(bitmap,cliprect,bg_tilemap,0,1); tilemap_draw(bitmap,cliprect,fg_tilemap,0,2); - draw_sprites(machine,bitmap,cliprect,0); + draw_sprites(screen->machine,bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; } @@ -467,12 +467,10 @@ VIDEO_UPDATE( hrdtimes ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,1); tilemap_draw(bitmap,cliprect,fg_tilemap,0,2); - draw_sprites(machine,bitmap,cliprect,2); + draw_sprites(screen->machine,bitmap,cliprect,2); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); } else - { - fillbitmap(bitmap,get_black_pen(machine),cliprect); - } + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); return 0; } diff --git a/src/mame/video/plygonet.c b/src/mame/video/plygonet.c index 2faab9a9d1d..7e53146c887 100644 --- a/src/mame/video/plygonet.c +++ b/src/mame/video/plygonet.c @@ -82,7 +82,7 @@ VIDEO_START( polygonet ) VIDEO_UPDATE( polygonet ) { fillbitmap(priority_bitmap, 0, NULL); - fillbitmap(bitmap, get_black_pen(machine), &machine->screen[0].visarea); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); tilemap_draw(bitmap, cliprect, ttl_tilemap, 0, 1<<0); return 0; diff --git a/src/mame/video/pokechmp.c b/src/mame/video/pokechmp.c index 288f33b8ed2..5f49e354d55 100644 --- a/src/mame/video/pokechmp.c +++ b/src/mame/video/pokechmp.c @@ -69,6 +69,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( pokechmp ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/polepos.c b/src/mame/video/polepos.c index c01c9a3e575..65a900cf06f 100644 --- a/src/mame/video/polepos.c +++ b/src/mame/video/polepos.c @@ -512,7 +512,7 @@ VIDEO_UPDATE( polepos ) clip.max_y = 127; tilemap_draw(bitmap,&clip,bg_tilemap,0,0); draw_road(bitmap); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); /* following code should be enabled only in a debug build */ /* original arcade doesn't work in this way */ diff --git a/src/mame/video/polyplay.c b/src/mame/video/polyplay.c index c5fed0aa086..2f663541a84 100644 --- a/src/mame/video/polyplay.c +++ b/src/mame/video/polyplay.c @@ -57,14 +57,14 @@ VIDEO_UPDATE( polyplay ) if (dirtycharacter[code]) { - decodechar(machine->gfx[1], code & 0x7f, polyplay_characterram); + decodechar(screen->machine->gfx[1], code & 0x7f, polyplay_characterram); dirtycharacter[code] = 0; } - drawgfx(bitmap,machine->gfx[(code >> 7) & 0x01], + drawgfx(bitmap,screen->machine->gfx[(code >> 7) & 0x01], code, 0, 0, 0, sx, sy, - &machine->screen[0].visarea, TRANSPARENCY_NONE, 0); + cliprect, TRANSPARENCY_NONE, 0); } return 0; diff --git a/src/mame/video/poolshrk.c b/src/mame/video/poolshrk.c index 442097d17f7..57073f77b17 100644 --- a/src/mame/video/poolshrk.c +++ b/src/mame/video/poolshrk.c @@ -44,7 +44,7 @@ VIDEO_UPDATE( poolshrk ) int hpos = poolshrk_hpos_ram[i]; int vpos = poolshrk_vpos_ram[i]; - drawgfx(bitmap, machine->gfx[0], i, (i == 0) ? 0 : 1, 0, 0, + drawgfx(bitmap, screen->machine->gfx[0], i, (i == 0) ? 0 : 1, 0, 0, 248 - hpos, vpos - 15, cliprect, TRANSPARENCY_PEN, 0); } diff --git a/src/mame/video/pooyan.c b/src/mame/video/pooyan.c index ec3451b6022..0be863297d0 100644 --- a/src/mame/video/pooyan.c +++ b/src/mame/video/pooyan.c @@ -194,6 +194,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( pooyan ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/popeye.c b/src/mame/video/popeye.c index b92dab58d6a..b7eaa50119d 100644 --- a/src/mame/video/popeye.c +++ b/src/mame/video/popeye.c @@ -364,8 +364,8 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( popeye ) { - draw_background(machine, bitmap, cliprect); - draw_sprites(machine, bitmap, cliprect); + draw_background(screen->machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/popper.c b/src/mame/video/popper.c index bb396e86624..47ee48b01bf 100644 --- a/src/mame/video/popper.c +++ b/src/mame/video/popper.c @@ -235,7 +235,7 @@ VIDEO_UPDATE( popper ) tilemap_draw( bitmap,&finalclip,popper_ol_p123_tilemap,TILEMAP_DRAW_LAYER1,0 ); tilemap_draw( bitmap,&finalclip,popper_ol_p0_tilemap, TILEMAP_DRAW_LAYER1,0 ); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw( bitmap,cliprect,popper_p123_tilemap, TILEMAP_DRAW_LAYER0,0 ); tilemap_draw( bitmap,cliprect,popper_p0_tilemap, TILEMAP_DRAW_LAYER0,0 ); diff --git a/src/mame/video/portrait.c b/src/mame/video/portrait.c index 74a29fb02ac..9fab8f5c800 100644 --- a/src/mame/video/portrait.c +++ b/src/mame/video/portrait.c @@ -166,6 +166,6 @@ VIDEO_UPDATE( portrait ) tilemap_draw(bitmap, &cliprect_scroll, background, 0, 0); tilemap_draw(bitmap, &cliprect_scroll, foreground, 0, 0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/powerins.c b/src/mame/video/powerins.c index 83bb8c000ca..54a15988461 100644 --- a/src/mame/video/powerins.c +++ b/src/mame/video/powerins.c @@ -368,7 +368,7 @@ if (input_code_pressed(KEYCODE_Z)) if (layers_ctrl&1) tilemap_draw(bitmap,cliprect, tilemap_0, 0, 0); else fillbitmap(bitmap,0,cliprect); - if (layers_ctrl&8) draw_sprites(machine,bitmap,cliprect); + if (layers_ctrl&8) draw_sprites(screen->machine,bitmap,cliprect); if (layers_ctrl&2) tilemap_draw(bitmap,cliprect, tilemap_1, 0, 0); return 0; } diff --git a/src/mame/video/prehisle.c b/src/mame/video/prehisle.c index 757ba4c0c04..8a0bc2b3abc 100644 --- a/src/mame/video/prehisle.c +++ b/src/mame/video/prehisle.c @@ -146,9 +146,9 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( prehisle ) { tilemap_draw(bitmap, cliprect, bg2_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect, 0); + draw_sprites(screen->machine, bitmap, cliprect, 0); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect, 1); + draw_sprites(screen->machine, bitmap, cliprect, 1); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/psikyo.c b/src/mame/video/psikyo.c index 497d451266c..af44e4785e1 100644 --- a/src/mame/video/psikyo.c +++ b/src/mame/video/psikyo.c @@ -576,7 +576,7 @@ VIDEO_UPDATE( psikyo ) tilemap_set_transparent_pen(tilemap_1_size2,(layer1_ctrl & 8 ?0:15)); tilemap_set_transparent_pen(tilemap_1_size3,(layer1_ctrl & 8 ?0:15)); - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); fillbitmap(priority_bitmap,0,cliprect); @@ -587,7 +587,7 @@ VIDEO_UPDATE( psikyo ) tilemap_draw(bitmap,cliprect,tmptilemap1, layer1_ctrl & 2 ? TILEMAP_DRAW_OPAQUE : 0, 2); if (layers_ctrl & 4) - draw_sprites(machine, bitmap,cliprect,(spr_ctrl & 4 ? 0 : 15)); + draw_sprites(screen->machine, bitmap,cliprect,(spr_ctrl & 4 ? 0 : 15)); return 0; } diff --git a/src/mame/video/psikyo4.c b/src/mame/video/psikyo4.c index e9849cae0a6..151bc8043de 100644 --- a/src/mame/video/psikyo4.c +++ b/src/mame/video/psikyo4.c @@ -125,15 +125,15 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( psikyo4 ) { - if (screen==0) + if (scrnum==0) { fillbitmap(bitmap, 0x1000, cliprect); - draw_sprites(machine, bitmap, cliprect, 0x0000); + draw_sprites(screen->machine, bitmap, cliprect, 0x0000); } - else if (screen==1) + else if (scrnum==1) { fillbitmap(bitmap, 0x1001, cliprect); - draw_sprites(machine, bitmap, cliprect, 0x2000); + draw_sprites(screen->machine, bitmap, cliprect, 0x2000); } return 0; } diff --git a/src/mame/video/psikyosh.c b/src/mame/video/psikyosh.c index 88e94d5f4b0..033cd4c955a 100644 --- a/src/mame/video/psikyosh.c +++ b/src/mame/video/psikyosh.c @@ -295,7 +295,7 @@ static void draw_bglayerscroll(running_machine *machine, int layer, bitmap_t *bi /* Looks better with blending and one scroll value than with 1D linescroll and no zoom */ #if 0 int bg_scrollx[256], bg_scrolly[512]; - fillbitmap(zoom_bitmap, get_black_pen(machine), NULL); + fillbitmap(zoom_bitmap, get_black_pen(screen->machine), NULL); for (offs=0; offs<(0x400/4); offs++) /* 224 values for each */ { bg_scrollx[offs] = (psikyosh_bgram[(scrollbank*0x800)/4 + offs - 0x4000/4] & 0x000001ff) >> 0; @@ -1128,14 +1128,14 @@ static void psikyosh_postlineblend( bitmap_t *bitmap, const rectangle *cliprect VIDEO_UPDATE( psikyosh ) /* Note the z-buffer on each sprite to get correct priority */ { int i; - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); fillbitmap(z_bitmap,0,cliprect); /* z-buffer */ psikyosh_prelineblend(bitmap, cliprect); for (i=0; i<=7; i++) { - draw_sprites(machine, bitmap, cliprect, i); // When same priority bg's have higher pri - draw_background(machine, bitmap, cliprect, i); + draw_sprites(screen->machine, bitmap, cliprect, i); // When same priority bg's have higher pri + draw_background(screen->machine, bitmap, cliprect, i); if((psikyosh_vidregs[2]&0xf) == i) psikyosh_postlineblend(bitmap, cliprect); } return 0; diff --git a/src/mame/video/psychic5.c b/src/mame/video/psychic5.c index 03d378cf26a..96fd8a2cf75 100644 --- a/src/mame/video/psychic5.c +++ b/src/mame/video/psychic5.c @@ -460,8 +460,8 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap, const re VIDEO_UPDATE( psychic5 ) { - draw_background(machine, bitmap, cliprect); - draw_sprites(machine, bitmap, cliprect); + draw_background(screen->machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/punchout.c b/src/mame/video/punchout.c index edd272ce41c..48bab85916b 100644 --- a/src/mame/video/punchout.c +++ b/src/mame/video/punchout.c @@ -424,7 +424,7 @@ static void drawbs2(running_machine *machine, bitmap_t *bitmap, const rectangle VIDEO_UPDATE( punchout ) { - if (screen == 1) + if (scrnum == 1) { tilemap_draw(bitmap, cliprect, punchout_topTilemap, 0, 0); @@ -443,7 +443,7 @@ VIDEO_UPDATE( punchout ) if (punchout_bigsprite1[7] & 2) /* display in bottom monitor */ draw_big_sprite(bitmap, cliprect); - drawbs2(machine, bitmap, cliprect); + drawbs2(screen->machine, bitmap, cliprect); } return 0; } @@ -451,7 +451,7 @@ VIDEO_UPDATE( punchout ) VIDEO_UPDATE( armwrest ) { - if (screen == 1) + if (scrnum == 1) { tilemap_draw(bitmap, cliprect, punchout_topTilemap, 0, 0); @@ -464,7 +464,7 @@ VIDEO_UPDATE( armwrest ) if (punchout_bigsprite1[7] & 2) /* display in bottom monitor */ armwrest_draw_big_sprite(bitmap, cliprect); - drawbs2(machine, bitmap, cliprect); + drawbs2(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, fgtilemap, 0, 0); } diff --git a/src/mame/video/pushman.c b/src/mame/video/pushman.c index 4a1b0774471..c9091c1eb4f 100644 --- a/src/mame/video/pushman.c +++ b/src/mame/video/pushman.c @@ -113,7 +113,7 @@ VIDEO_UPDATE( pushman ) tilemap_set_scrolly( bg_tilemap,0, 0xf00-control[1] ); tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; } diff --git a/src/mame/video/qdrmfgp.c b/src/mame/video/qdrmfgp.c index 50a6be09f39..9aa4dce1809 100644 --- a/src/mame/video/qdrmfgp.c +++ b/src/mame/video/qdrmfgp.c @@ -59,11 +59,11 @@ VIDEO_START( qdrmfgp2 ) VIDEO_UPDATE( qdrmfgp ) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); - K056832_tilemap_draw(machine, bitmap,cliprect, 3, 0, 1); - K056832_tilemap_draw(machine, bitmap,cliprect, 2, 0, 2); - K056832_tilemap_draw(machine, bitmap,cliprect, 1, 0, 4); - K056832_tilemap_draw(machine, bitmap,cliprect, 0, 0, 8); + K056832_tilemap_draw(screen->machine, bitmap,cliprect, 3, 0, 1); + K056832_tilemap_draw(screen->machine, bitmap,cliprect, 2, 0, 2); + K056832_tilemap_draw(screen->machine, bitmap,cliprect, 1, 0, 4); + K056832_tilemap_draw(screen->machine, bitmap,cliprect, 0, 0, 8); return 0; } diff --git a/src/mame/video/qix.c b/src/mame/video/qix.c index 6f31a148ed2..dfe83be0ce9 100644 --- a/src/mame/video/qix.c +++ b/src/mame/video/qix.c @@ -351,7 +351,7 @@ static MC6845_UPDATE_ROW( update_row ) static VIDEO_UPDATE( qix ) { - const device_config *mc6845 = device_list_find_by_tag(machine->config->devicelist, MC6845, MC6845_TAG); + const device_config *mc6845 = device_list_find_by_tag(screen->machine->config->devicelist, MC6845, MC6845_TAG); mc6845_update(mc6845, bitmap, cliprect); return 0; diff --git a/src/mame/video/quasar.c b/src/mame/video/quasar.c index 5abb35ed0c2..3ba5a178d36 100644 --- a/src/mame/video/quasar.c +++ b/src/mame/video/quasar.c @@ -136,7 +136,7 @@ VIDEO_UPDATE( quasar ) /* Main Screen */ - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], code, cvs_color_ram[offs] & 0x3f, 0,0, @@ -148,7 +148,7 @@ VIDEO_UPDATE( quasar ) if((cvs_color_ram[offs] & 7) == 0) { - drawgfx(cvs_collision_background,machine->gfx[0], + drawgfx(cvs_collision_background,screen->machine->gfx[0], code, 64, 0,0, @@ -203,7 +203,7 @@ VIDEO_UPDATE( quasar ) *BITMAP_ADDR16(bitmap, y, x) = S2636_PIXEL_COLOR(pixel); /* S2636 vs. background collision detection */ - if (colortable_entry_get_value(machine->colortable, *BITMAP_ADDR16(cvs_collision_background, y, x))) + if (colortable_entry_get_value(screen->machine->colortable, *BITMAP_ADDR16(cvs_collision_background, y, x))) { if (S2636_IS_PIXEL_DRAWN(pixel0)) cvs_collision_register |= 0x01; if (S2636_IS_PIXEL_DRAWN(pixel2)) cvs_collision_register |= 0x02; diff --git a/src/mame/video/quizdna.c b/src/mame/video/quizdna.c index 54961e30d5e..69eccc8bb6b 100644 --- a/src/mame/video/quizdna.c +++ b/src/mame/video/quizdna.c @@ -194,10 +194,10 @@ VIDEO_UPDATE( quizdna ) if (quizdna_video_enable) { tilemap_draw(bitmap, cliprect, quizdna_bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, quizdna_fg_tilemap, 0, 0); } else - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); return 0; } diff --git a/src/mame/video/raiden.c b/src/mame/video/raiden.c index e27cae3f012..87c3bd84b9f 100644 --- a/src/mame/video/raiden.c +++ b/src/mame/video/raiden.c @@ -152,11 +152,11 @@ VIDEO_UPDATE( raiden ) tilemap_draw(bitmap,cliprect,bg_layer,0,0); /* Draw sprites underneath foreground */ - draw_sprites(machine,bitmap,cliprect,0x40); + draw_sprites(screen->machine,bitmap,cliprect,0x40); tilemap_draw(bitmap,cliprect,fg_layer,0,0); /* Rest of sprites */ - draw_sprites(machine,bitmap,cliprect,0x80); + draw_sprites(screen->machine,bitmap,cliprect,0x80); /* Text layer */ tilemap_draw(bitmap,cliprect,tx_layer,0,0); diff --git a/src/mame/video/rallyx.c b/src/mame/video/rallyx.c index 3f9d2c01d20..6681abf7807 100644 --- a/src/mame/video/rallyx.c +++ b/src/mame/video/rallyx.c @@ -661,9 +661,9 @@ VIDEO_UPDATE( rallyx ) tilemap_draw(bitmap,&bg_clip,bg_tilemap,1,1); tilemap_draw(bitmap,&fg_clip,fg_tilemap,1,1); - rallyx_draw_bullets(machine, bitmap,cliprect,TRANSPARENCY_PEN); - rallyx_draw_sprites(machine, bitmap,cliprect,1); - rallyx_draw_bullets(machine, bitmap,cliprect,TRANSPARENCY_PEN_TABLE); + rallyx_draw_bullets(screen->machine, bitmap,cliprect,TRANSPARENCY_PEN); + rallyx_draw_sprites(screen->machine, bitmap,cliprect,1); + rallyx_draw_bullets(screen->machine, bitmap,cliprect,TRANSPARENCY_PEN_TABLE); return 0; } @@ -694,12 +694,12 @@ VIDEO_UPDATE( jungler ) tilemap_draw(bitmap,&bg_clip,bg_tilemap,1,0); tilemap_draw(bitmap,&fg_clip,fg_tilemap,1,0); - jungler_draw_bullets(machine, bitmap,cliprect,TRANSPARENCY_PEN); - rallyx_draw_sprites(machine, bitmap,cliprect,0); - jungler_draw_bullets(machine, bitmap,cliprect,TRANSPARENCY_PEN_TABLE); + jungler_draw_bullets(screen->machine, bitmap,cliprect,TRANSPARENCY_PEN); + rallyx_draw_sprites(screen->machine, bitmap,cliprect,0); + jungler_draw_bullets(screen->machine, bitmap,cliprect,TRANSPARENCY_PEN_TABLE); if (stars_enable) - draw_stars(machine, bitmap, cliprect); + draw_stars(screen->machine, bitmap, cliprect); return 0; } @@ -729,12 +729,12 @@ VIDEO_UPDATE( locomotn ) tilemap_draw(bitmap,&bg_clip,bg_tilemap,1,1); tilemap_draw(bitmap,&fg_clip,fg_tilemap,1,1); - locomotn_draw_bullets(machine, bitmap,cliprect,TRANSPARENCY_PEN); - locomotn_draw_sprites(machine, bitmap,cliprect,0); - locomotn_draw_bullets(machine, bitmap,cliprect,TRANSPARENCY_PEN_TABLE); + locomotn_draw_bullets(screen->machine, bitmap,cliprect,TRANSPARENCY_PEN); + locomotn_draw_sprites(screen->machine, bitmap,cliprect,0); + locomotn_draw_bullets(screen->machine, bitmap,cliprect,TRANSPARENCY_PEN_TABLE); if (stars_enable) - draw_stars(machine, bitmap, cliprect); + draw_stars(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/rampart.c b/src/mame/video/rampart.c index f152860f11c..544a0984905 100644 --- a/src/mame/video/rampart.c +++ b/src/mame/video/rampart.c @@ -87,10 +87,10 @@ VIDEO_UPDATE( rampart ) int x, y, r; /* draw the playfield */ - rampart_bitmap_render(machine, bitmap, cliprect); + rampart_bitmap_render(screen->machine, bitmap, cliprect); /* draw and merge the MO */ - mobitmap = atarimo_render(machine, 0, cliprect, &rectlist); + mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) { diff --git a/src/mame/video/rastan.c b/src/mame/video/rastan.c index f7d867da9d8..00ae6eb39b6 100644 --- a/src/mame/video/rastan.c +++ b/src/mame/video/rastan.c @@ -107,7 +107,7 @@ VIDEO_UPDATE( rastan ) PC080SN_tilemap_draw(bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,1); PC080SN_tilemap_draw(bitmap,cliprect,0,layer[1],0,2); - PC090OJ_draw_sprites(machine,bitmap,cliprect,0); + PC090OJ_draw_sprites(screen->machine,bitmap,cliprect,0); return 0; } @@ -127,7 +127,7 @@ VIDEO_UPDATE( opwolf ) PC080SN_tilemap_draw(bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,1); PC080SN_tilemap_draw(bitmap,cliprect,0,layer[1],0,2); - PC090OJ_draw_sprites(machine,bitmap,cliprect,1); + PC090OJ_draw_sprites(screen->machine,bitmap,cliprect,1); // if (input_port_5_word_r(0,0xffff)) @@ -152,7 +152,7 @@ VIDEO_UPDATE( rainbow ) PC080SN_tilemap_draw(bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,1); PC080SN_tilemap_draw(bitmap,cliprect,0,layer[1],0,2); - PC090OJ_draw_sprites(machine,bitmap,cliprect,1); + PC090OJ_draw_sprites(screen->machine,bitmap,cliprect,1); return 0; } @@ -187,7 +187,7 @@ VIDEO_UPDATE( jumping ) for (offs = spriteram_size/2-8; offs >= 0; offs -= 8) { int tile = spriteram16[offs]; - if (tile < machine->gfx[1]->total_elements) + if (tile < screen->machine->gfx[1]->total_elements) { int sx,sy,color,data1; @@ -199,7 +199,7 @@ VIDEO_UPDATE( jumping ) data1 = spriteram16[offs+3]; color = (spriteram16[offs+4] & 0x0f) | sprite_colbank; - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], tile, color, data1 & 0x40, data1 & 0x80, diff --git a/src/mame/video/realbrk.c b/src/mame/video/realbrk.c index 8984d34efb8..e628af6b5b7 100644 --- a/src/mame/video/realbrk.c +++ b/src/mame/video/realbrk.c @@ -532,7 +532,7 @@ if ( input_code_pressed(KEYCODE_Z) ) if (disable_video) { - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); return 0; } else @@ -541,7 +541,7 @@ if ( input_code_pressed(KEYCODE_Z) ) if (layers_ctrl & 2) tilemap_draw(bitmap,cliprect,tilemap_1,0,0); if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect,tilemap_0,0,0); - if (layers_ctrl & 8) draw_sprites(machine,bitmap,cliprect); + if (layers_ctrl & 8) draw_sprites(screen->machine,bitmap,cliprect); if (layers_ctrl & 4) tilemap_draw(bitmap,cliprect,tilemap_2,0,0); @@ -600,7 +600,7 @@ if ( input_code_pressed(KEYCODE_Z) ) if (disable_video) { - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); return 0; } else diff --git a/src/mame/video/redclash.c b/src/mame/video/redclash.c index 9723805eca2..c7156635968 100644 --- a/src/mame/video/redclash.c +++ b/src/mame/video/redclash.c @@ -421,9 +421,9 @@ VIDEO_EOF( redclash ) VIDEO_UPDATE( redclash ) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); redclash_draw_stars(bitmap, cliprect, 0x60, 0, 0x00, 0xff); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); draw_bullets(bitmap, cliprect); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); return 0; diff --git a/src/mame/video/relief.c b/src/mame/video/relief.c index a4f305786e3..af7936296db 100644 --- a/src/mame/video/relief.c +++ b/src/mame/video/relief.c @@ -116,7 +116,7 @@ VIDEO_UPDATE( relief ) tilemap_draw(bitmap, cliprect, atarigen_playfield2_tilemap, 0, 1); /* draw and merge the MO */ - mobitmap = atarimo_render(machine, 0, cliprect, &rectlist); + mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) { diff --git a/src/mame/video/renegade.c b/src/mame/video/renegade.c index ff1f679dccc..be8a9166bc0 100644 --- a/src/mame/video/renegade.c +++ b/src/mame/video/renegade.c @@ -137,7 +137,7 @@ VIDEO_UPDATE( renegade ) { tilemap_set_scrollx(bg_tilemap, 0, renegade_scrollx); tilemap_draw(bitmap, cliprect, bg_tilemap, 0 , 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, fg_tilemap, 0 , 0); return 0; } diff --git a/src/mame/video/retofinv.c b/src/mame/video/retofinv.c index 1920408775a..4f42868589f 100644 --- a/src/mame/video/retofinv.c +++ b/src/mame/video/retofinv.c @@ -235,7 +235,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap) VIDEO_UPDATE( retofinv ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap); + draw_sprites(screen->machine, bitmap); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); return 0; } diff --git a/src/mame/video/rockola.c b/src/mame/video/rockola.c index 88df34eeaad..d6eb6391816 100644 --- a/src/mame/video/rockola.c +++ b/src/mame/video/rockola.c @@ -187,8 +187,8 @@ VIDEO_START( rockola ) VIDEO_UPDATE( rockola ) { - tilemap_draw(bitmap, &machine->screen[0].visarea, bg_tilemap, 0, 0); - tilemap_draw(bitmap, &machine->screen[0].visarea, fg_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/rockrage.c b/src/mame/video/rockrage.c index 69f40b42610..e2be46a4899 100644 --- a/src/mame/video/rockrage.c +++ b/src/mame/video/rockrage.c @@ -112,14 +112,14 @@ VIDEO_START( rockrage ) VIDEO_UPDATE( rockrage ) { - set_pens(machine->colortable); + set_pens(screen->machine->colortable); K007342_tilemap_update(); - K007342_tilemap_draw( bitmap,cliprect, 0, TILEMAP_DRAW_OPAQUE ,0); - K007420_sprites_draw( bitmap,cliprect ); - K007342_tilemap_draw( bitmap,cliprect, 0, 1 | TILEMAP_DRAW_OPAQUE ,0); - K007342_tilemap_draw( bitmap,cliprect, 1, 0 ,0); - K007342_tilemap_draw( bitmap,cliprect, 1, 1 ,0); + K007342_tilemap_draw(bitmap,cliprect, 0, TILEMAP_DRAW_OPAQUE ,0); + K007420_sprites_draw(bitmap,cliprect ); + K007342_tilemap_draw(bitmap,cliprect, 0, 1 | TILEMAP_DRAW_OPAQUE ,0); + K007342_tilemap_draw(bitmap,cliprect, 1, 0 ,0); + K007342_tilemap_draw(bitmap,cliprect, 1, 1 ,0); return 0; } diff --git a/src/mame/video/rocnrope.c b/src/mame/video/rocnrope.c index 2138e8391e4..bdebd8e96a6 100644 --- a/src/mame/video/rocnrope.c +++ b/src/mame/video/rocnrope.c @@ -139,6 +139,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( rocnrope ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/rohga.c b/src/mame/video/rohga.c index bd6989f0fdd..6a3376afb1c 100644 --- a/src/mame/video/rohga.c +++ b/src/mame/video/rohga.c @@ -480,7 +480,7 @@ static void update_rohga(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( rohga ) { - update_rohga(machine, bitmap, cliprect, 0); + update_rohga(screen->machine, bitmap, cliprect, 0); return 0; } @@ -488,7 +488,7 @@ VIDEO_UPDATE( schmeisr ) { // The Schmeisr pcb has wire mods which seem to remap sprite palette indices. // Otherwise video update is the same as Rohga. - update_rohga(machine, bitmap, cliprect, 1); + update_rohga(screen->machine, bitmap, cliprect, 1); return 0; } @@ -500,12 +500,12 @@ VIDEO_UPDATE( wizdfire ) deco16_pf34_update(deco16_pf3_rowscroll,deco16_pf4_rowscroll); /* Draw playfields - Palette of 2nd playfield chip visible if playfields turned off */ - fillbitmap(bitmap,machine->pens[512],&machine->screen[0].visarea); + fillbitmap(bitmap,screen->machine->pens[512],&screen->machine->screen[0].visarea); deco16_tilemap_4_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE,0); - wizdfire_draw_sprites(machine,bitmap,cliprect,buffered_spriteram16,4,3); + wizdfire_draw_sprites(screen->machine,bitmap,cliprect,buffered_spriteram16,4,3); deco16_tilemap_2_draw(bitmap,cliprect,0,0); - wizdfire_draw_sprites(machine,bitmap,cliprect,buffered_spriteram16,3,3); + wizdfire_draw_sprites(screen->machine,bitmap,cliprect,buffered_spriteram16,3,3); if ((deco16_priority&0x1f)==0x1f) /* Wizdfire has bit 0x40 always set, Dark Seal 2 doesn't?! */ deco16_tilemap_3_draw(bitmap,cliprect,TILEMAP_DRAW_ALPHA,0); @@ -513,9 +513,9 @@ VIDEO_UPDATE( wizdfire ) deco16_tilemap_3_draw(bitmap,cliprect,0,0); /* See notes in wizdfire_draw_sprites about this */ - wizdfire_draw_sprites(machine,bitmap,cliprect,buffered_spriteram16,0,3); - wizdfire_draw_sprites(machine,bitmap,cliprect,buffered_spriteram16_2,2,4); - wizdfire_draw_sprites(machine,bitmap,cliprect,buffered_spriteram16_2,1,4); + wizdfire_draw_sprites(screen->machine,bitmap,cliprect,buffered_spriteram16,0,3); + wizdfire_draw_sprites(screen->machine,bitmap,cliprect,buffered_spriteram16_2,2,4); + wizdfire_draw_sprites(screen->machine,bitmap,cliprect,buffered_spriteram16_2,1,4); deco16_tilemap_1_draw(bitmap,cliprect,0,0); return 0; @@ -529,7 +529,7 @@ VIDEO_UPDATE( nitrobal ) deco16_pf34_update(deco16_pf3_rowscroll,deco16_pf4_rowscroll); /* Draw playfields - Palette of 2nd playfield chip visible if playfields turned off */ - fillbitmap(bitmap,machine->pens[512],&machine->screen[0].visarea); + fillbitmap(bitmap,screen->machine->pens[512],&screen->machine->screen[0].visarea); fillbitmap(priority_bitmap,0,NULL); deco16_clear_sprite_priority_bitmap(); @@ -537,8 +537,8 @@ VIDEO_UPDATE( nitrobal ) deco16_tilemap_34_combine_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE,0); deco16_tilemap_2_draw(bitmap,cliprect,0,16); - nitrobal_draw_sprites(machine,bitmap,cliprect,buffered_spriteram16,3); - nitrobal_draw_sprites(machine,bitmap,cliprect,buffered_spriteram16_2,4); + nitrobal_draw_sprites(screen->machine,bitmap,cliprect,buffered_spriteram16,3); + nitrobal_draw_sprites(screen->machine,bitmap,cliprect,buffered_spriteram16_2,4); deco16_tilemap_1_draw(bitmap,cliprect,0,0); return 0; diff --git a/src/mame/video/rollrace.c b/src/mame/video/rollrace.c index 2bd3a9d4328..6afb50b8ab5 100644 --- a/src/mame/video/rollrace.c +++ b/src/mame/video/rollrace.c @@ -66,7 +66,7 @@ VIDEO_UPDATE( rollrace ) int col; /* fill in background colour*/ - fillbitmap(bitmap,ra_bkgpen,&machine->screen[0].visarea); + fillbitmap(bitmap,ra_bkgpen,cliprect); /* draw road */ for (offs = videoram_size - 1;offs >= 0;offs--) @@ -87,13 +87,13 @@ VIDEO_UPDATE( rollrace ) sy = 31-sy ; drawgfx(bitmap, - machine->gfx[RA_BGCHAR_BASE], + screen->machine->gfx[RA_BGCHAR_BASE], memory_region(REGION_USER1)[offs + ( ra_bkgpage * 1024 )] \ + ((( memory_region(REGION_USER1)[offs + 0x4000 + ( ra_bkgpage * 1024 )] & 0xc0 ) >> 6 ) * 256 ) , ra_bkgcol, ra_flipx,(ra_bkgflip^ra_flipy), sx*8,sy*8, - &machine->screen[0].visarea,TRANSPARENCY_PEN,0); + cliprect,TRANSPARENCY_PEN,0); } @@ -126,12 +126,12 @@ VIDEO_UPDATE( rollrace ) if(bank) bank += ra_spritebank; - drawgfx(bitmap, machine->gfx[ RA_SP_BASE + bank ], + drawgfx(bitmap, screen->machine->gfx[ RA_SP_BASE + bank ], spriteram[offs+1] & 0x3f , spriteram[offs+2] & 0x1f, ra_flipx,!(s_flipy^ra_flipy), sx,sy, - &machine->screen[0].visarea,TRANSPARENCY_PEN,0); + cliprect,TRANSPARENCY_PEN,0); } } @@ -155,12 +155,12 @@ VIDEO_UPDATE( rollrace ) if (ra_flipx) sx = 31 - sx; - drawgfx(bitmap,machine->gfx[RA_FGCHAR_BASE + ra_chrbank] , + drawgfx(bitmap,screen->machine->gfx[RA_FGCHAR_BASE + ra_chrbank] , videoram[ offs ] , col, ra_flipx,ra_flipy, 8*sx,scroll, - &machine->screen[0].visarea,TRANSPARENCY_PEN,0); + cliprect,TRANSPARENCY_PEN,0); } diff --git a/src/mame/video/rpunch.c b/src/mame/video/rpunch.c index 0e9155b8bc9..53bee97bf5e 100644 --- a/src/mame/video/rpunch.c +++ b/src/mame/video/rpunch.c @@ -283,9 +283,9 @@ VIDEO_UPDATE( rpunch ) effbins = (bins > gins) ? gins : bins; tilemap_draw(bitmap,cliprect, background[0], 0,0); - draw_sprites(machine, bitmap,cliprect, 0, effbins); + draw_sprites(screen->machine, bitmap,cliprect, 0, effbins); tilemap_draw(bitmap,cliprect, background[1], 0,0); - draw_sprites(machine, bitmap,cliprect, effbins, gins); + draw_sprites(screen->machine, bitmap,cliprect, effbins, gins); if (rpunch_bitmapram) draw_bitmap(bitmap,cliprect); return 0; diff --git a/src/mame/video/runaway.c b/src/mame/video/runaway.c index aafa61d0c68..7f5dc12b455 100644 --- a/src/mame/video/runaway.c +++ b/src/mame/video/runaway.c @@ -106,14 +106,14 @@ VIDEO_UPDATE( runaway ) code |= (runaway_sprite_ram[i + 0x30] << 2) & 0x1c0; - drawgfx(bitmap, machine->gfx[1], + drawgfx(bitmap, screen->machine->gfx[1], code, 0, flipx, flipy, x, 240 - y, cliprect, TRANSPARENCY_PEN, 0); - drawgfx(bitmap, machine->gfx[1], + drawgfx(bitmap, screen->machine->gfx[1], code, 0, flipx, flipy, @@ -142,14 +142,14 @@ VIDEO_UPDATE( qwak ) code |= (runaway_sprite_ram[i + 0x30] << 2) & 0x1c0; - drawgfx(bitmap, machine->gfx[1], + drawgfx(bitmap, screen->machine->gfx[1], code, 0, flipx, flipy, x, 240 - y, cliprect, TRANSPARENCY_PEN, 0); - drawgfx(bitmap, machine->gfx[1], + drawgfx(bitmap, screen->machine->gfx[1], code, 0, flipx, flipy, diff --git a/src/mame/video/rungun.c b/src/mame/video/rungun.c index 981b360b098..98c8cd4fae5 100644 --- a/src/mame/video/rungun.c +++ b/src/mame/video/rungun.c @@ -114,12 +114,12 @@ VIDEO_START(rng) VIDEO_UPDATE(rng) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); fillbitmap(priority_bitmap, 0, cliprect); K053936_0_zoom_draw(bitmap, cliprect, rng_936_tilemap, 0, 0); - K053247_sprites_draw(machine, bitmap, cliprect); + K053247_sprites_draw(screen->machine, bitmap, cliprect); tilemap_mark_all_tiles_dirty(ttl_tilemap); tilemap_draw(bitmap, cliprect, ttl_tilemap, 0, 0); diff --git a/src/mame/video/sauro.c b/src/mame/video/sauro.c index 1ea859029b2..de3e827fe7f 100644 --- a/src/mame/video/sauro.c +++ b/src/mame/video/sauro.c @@ -146,7 +146,7 @@ VIDEO_UPDATE( sauro ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); - sauro_draw_sprites(machine, bitmap, cliprect); + sauro_draw_sprites(screen->machine, bitmap, cliprect); return 0; } @@ -220,6 +220,6 @@ static void trckydoc_draw_sprites(running_machine *machine, bitmap_t *bitmap, co VIDEO_UPDATE( trckydoc ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - trckydoc_draw_sprites(machine, bitmap, cliprect); + trckydoc_draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/sbasketb.c b/src/mame/video/sbasketb.c index cefe13289d1..a06328f8422 100644 --- a/src/mame/video/sbasketb.c +++ b/src/mame/video/sbasketb.c @@ -175,11 +175,9 @@ VIDEO_UPDATE( sbasketb ) int col; for (col = 6; col < 32; col++) - { tilemap_set_scrolly(bg_tilemap, col, *sbasketb_scroll); - } tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/scotrsht.c b/src/mame/video/scotrsht.c index 459e8517d80..7c06c15d56b 100644 --- a/src/mame/video/scotrsht.c +++ b/src/mame/video/scotrsht.c @@ -137,6 +137,6 @@ VIDEO_UPDATE( scotrsht ) tilemap_set_scrolly(bg_tilemap, col, scotrsht_scroll[col]); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/sderby.c b/src/mame/video/sderby.c index ca78cd85a65..ded57765138 100644 --- a/src/mame/video/sderby.c +++ b/src/mame/video/sderby.c @@ -107,7 +107,7 @@ VIDEO_START( sderby ) VIDEO_UPDATE( sderby ) { tilemap_draw(bitmap,cliprect,sderby_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect,0); + draw_sprites(screen->machine, bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,sderby_md_tilemap,0,0); tilemap_draw(bitmap,cliprect,sderby_fg_tilemap,0,0); return 0; @@ -117,7 +117,7 @@ VIDEO_UPDATE( pmroulet ) { tilemap_draw(bitmap,cliprect,sderby_tilemap,0,0); tilemap_draw(bitmap,cliprect,sderby_md_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect,0); + draw_sprites(screen->machine, bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,sderby_fg_tilemap,0,0); return 0; } diff --git a/src/mame/video/segag80r.c b/src/mame/video/segag80r.c index d3a6304ae2f..c66621907b0 100644 --- a/src/mame/video/segag80r.c +++ b/src/mame/video/segag80r.c @@ -826,7 +826,7 @@ VIDEO_UPDATE( segag80r ) /* background: none */ case G80_BACKGROUND_NONE: memset(transparent_pens, 0, 16); - draw_videoram(machine, bitmap, cliprect, transparent_pens); + draw_videoram(screen->machine, bitmap, cliprect, transparent_pens); break; /* foreground: visible except where black */ @@ -834,7 +834,7 @@ VIDEO_UPDATE( segag80r ) /* we draw the foreground first, then the background to do collision detection */ case G80_BACKGROUND_SPACEOD: memset(transparent_pens, 0, 16); - draw_videoram(machine, bitmap, cliprect, transparent_pens); + draw_videoram(screen->machine, bitmap, cliprect, transparent_pens); draw_background_spaceod(bitmap, cliprect); break; @@ -843,7 +843,7 @@ VIDEO_UPDATE( segag80r ) case G80_BACKGROUND_MONSTERB: memset(transparent_pens, 1, 16); draw_background_page_scroll(bitmap, cliprect); - draw_videoram(machine, bitmap, cliprect, transparent_pens); + draw_videoram(screen->machine, bitmap, cliprect, transparent_pens); break; /* foreground: visible except for pen 0 */ @@ -851,7 +851,7 @@ VIDEO_UPDATE( segag80r ) case G80_BACKGROUND_PIGNEWT: memset(transparent_pens, 1, 16); draw_background_full_scroll(bitmap, cliprect); - draw_videoram(machine, bitmap, cliprect, transparent_pens); + draw_videoram(screen->machine, bitmap, cliprect, transparent_pens); break; /* foreground: visible except for pen 0 */ @@ -859,7 +859,7 @@ VIDEO_UPDATE( segag80r ) case G80_BACKGROUND_SINDBADM: memset(transparent_pens, 1, 16); draw_background_page_scroll(bitmap, cliprect); - draw_videoram(machine, bitmap, cliprect, transparent_pens); + draw_videoram(screen->machine, bitmap, cliprect, transparent_pens); break; } return 0; diff --git a/src/mame/video/segahang.c b/src/mame/video/segahang.c index 0edaa671cfe..d89edff94e3 100644 --- a/src/mame/video/segahang.c +++ b/src/mame/video/segahang.c @@ -60,7 +60,7 @@ VIDEO_UPDATE( hangon ) /* if no drawing is happening, fill with black and get out */ if (!segaic16_display_enable) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); return 0; } @@ -71,12 +71,12 @@ VIDEO_UPDATE( hangon ) segaic16_road_draw(0, bitmap, cliprect, SEGAIC16_ROAD_BACKGROUND); /* draw background */ - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0, 0x01); - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 1, 0x02); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0, 0x01); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 1, 0x02); /* draw foreground */ - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 0, 0x02); - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 1, 0x04); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 0, 0x02); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 1, 0x04); /* draw the high priority road */ segaic16_road_draw(0, bitmap, cliprect, SEGAIC16_ROAD_FOREGROUND); @@ -84,8 +84,8 @@ VIDEO_UPDATE( hangon ) /* text layer */ /* note that we inflate the priority of the text layer to prevent sprites */ /* from drawing over the high scores */ - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 0, 0x08); - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 1, 0x08); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 0, 0x08); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 1, 0x08); /* draw the sprites */ segaic16_sprites_draw(0, bitmap, cliprect); diff --git a/src/mame/video/segaorun.c b/src/mame/video/segaorun.c index 05c5155d616..5266737489b 100644 --- a/src/mame/video/segaorun.c +++ b/src/mame/video/segaorun.c @@ -64,12 +64,12 @@ VIDEO_UPDATE( shangon ) segaic16_road_draw(0, bitmap, cliprect, SEGAIC16_ROAD_BACKGROUND); /* draw background */ - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0, 0x01); - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 1, 0x02); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0, 0x01); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 1, 0x02); /* draw foreground */ - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 0, 0x02); - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 1, 0x04); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 0, 0x02); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 1, 0x04); /* draw the high priority road */ segaic16_road_draw(0, bitmap, cliprect, SEGAIC16_ROAD_FOREGROUND); @@ -77,8 +77,8 @@ VIDEO_UPDATE( shangon ) /* text layer */ /* note that we inflate the priority of the text layer to prevent sprites */ /* from drawing over the high scores */ - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 0, 0x08); - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 1, 0x08); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 0, 0x08); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 1, 0x08); /* draw the sprites */ segaic16_sprites_draw(0, bitmap, cliprect); @@ -91,7 +91,7 @@ VIDEO_UPDATE( outrun ) /* if no drawing is happening, fill with black and get out */ if (!segaic16_display_enable) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); return 0; } @@ -102,19 +102,19 @@ VIDEO_UPDATE( outrun ) segaic16_road_draw(0, bitmap, cliprect, SEGAIC16_ROAD_BACKGROUND); /* draw background */ - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0, 0x01); - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 1, 0x02); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0, 0x01); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 1, 0x02); /* draw foreground */ - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 0, 0x02); - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 1, 0x04); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 0, 0x02); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 1, 0x04); /* draw the high priority road */ segaic16_road_draw(0, bitmap, cliprect, SEGAIC16_ROAD_FOREGROUND); /* text layer */ - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 0, 0x04); - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 1, 0x08); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 0, 0x04); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 1, 0x08); /* draw the sprites */ segaic16_sprites_draw(0, bitmap, cliprect); diff --git a/src/mame/video/segas16a.c b/src/mame/video/segas16a.c index 1c5eff3f412..da5b3653bf7 100644 --- a/src/mame/video/segas16a.c +++ b/src/mame/video/segas16a.c @@ -41,7 +41,7 @@ VIDEO_UPDATE( system16a ) /* if no drawing is happening, fill with black and get out */ if (!segaic16_display_enable) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); return 0; } @@ -49,20 +49,20 @@ VIDEO_UPDATE( system16a ) fillbitmap(priority_bitmap, 0, cliprect); /* draw background opaquely first, not setting any priorities */ - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0 | TILEMAP_DRAW_OPAQUE, 0x00); - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 1 | TILEMAP_DRAW_OPAQUE, 0x00); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0 | TILEMAP_DRAW_OPAQUE, 0x00); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 1 | TILEMAP_DRAW_OPAQUE, 0x00); /* draw background again, just to set the priorities on non-transparent pixels */ - segaic16_tilemap_draw(machine, 0, NULL, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0, 0x01); - segaic16_tilemap_draw(machine, 0, NULL, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 1, 0x02); + segaic16_tilemap_draw(screen->machine, 0, NULL, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0, 0x01); + segaic16_tilemap_draw(screen->machine, 0, NULL, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 1, 0x02); /* draw foreground */ - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 0, 0x02); - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 1, 0x04); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 0, 0x02); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 1, 0x04); /* text layer */ - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 0, 0x04); - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 1, 0x08); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 0, 0x04); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 1, 0x08); /* draw the sprites */ segaic16_sprites_draw(0, bitmap, cliprect); diff --git a/src/mame/video/segas16b.c b/src/mame/video/segas16b.c index a8a0fe484ba..77ca7a16e55 100644 --- a/src/mame/video/segas16b.c +++ b/src/mame/video/segas16b.c @@ -53,7 +53,7 @@ VIDEO_UPDATE( system16b ) /* if no drawing is happening, fill with black and get out */ if (!segaic16_display_enable) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); return 0; } @@ -61,20 +61,20 @@ VIDEO_UPDATE( system16b ) fillbitmap(priority_bitmap, 0, cliprect); /* draw background opaquely first, not setting any priorities */ - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0 | TILEMAP_DRAW_OPAQUE, 0x00); - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 1 | TILEMAP_DRAW_OPAQUE, 0x00); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0 | TILEMAP_DRAW_OPAQUE, 0x00); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 1 | TILEMAP_DRAW_OPAQUE, 0x00); /* draw background again, just to set the priorities on non-transparent pixels */ - segaic16_tilemap_draw(machine, 0, NULL, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0, 0x01); - segaic16_tilemap_draw(machine, 0, NULL, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 1, 0x02); + segaic16_tilemap_draw(screen->machine, 0, NULL, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0, 0x01); + segaic16_tilemap_draw(screen->machine, 0, NULL, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 1, 0x02); /* draw foreground */ - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 0, 0x02); - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 1, 0x04); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 0, 0x02); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 1, 0x04); /* text layer */ - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 0, 0x04); - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 1, 0x08); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 0, 0x04); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 1, 0x08); /* draw the sprites */ segaic16_sprites_draw(0, bitmap, cliprect); diff --git a/src/mame/video/segas18.c b/src/mame/video/segas18.c index 54df99ac1ac..cbcb3d2f176 100644 --- a/src/mame/video/segas18.c +++ b/src/mame/video/segas18.c @@ -206,7 +206,7 @@ VIDEO_UPDATE( system18 ) /* if no drawing is happening, fill with black and get out */ if (!segaic16_display_enable) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); return 0; } @@ -218,23 +218,23 @@ VIDEO_UPDATE( system18 ) fillbitmap(priority_bitmap, 0, cliprect); /* draw background opaquely first, not setting any priorities */ - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0 | TILEMAP_DRAW_OPAQUE, 0x00); - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 1 | TILEMAP_DRAW_OPAQUE, 0x00); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0 | TILEMAP_DRAW_OPAQUE, 0x00); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 1 | TILEMAP_DRAW_OPAQUE, 0x00); if (vdp_enable && vdplayer == 0) draw_vdp(bitmap, cliprect, vdppri); /* draw background again to draw non-transparent pixels over the VDP and set the priority */ - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0, 0x01); - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 1, 0x02); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0, 0x01); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 1, 0x02); if (vdp_enable && vdplayer == 1) draw_vdp(bitmap, cliprect, vdppri); /* draw foreground */ - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 0, 0x02); - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 1, 0x04); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 0, 0x02); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 1, 0x04); if (vdp_enable && vdplayer == 2) draw_vdp(bitmap, cliprect, vdppri); /* text layer */ - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 0, 0x04); - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 1, 0x08); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 0, 0x04); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 1, 0x08); if (vdp_enable && vdplayer == 3) draw_vdp(bitmap, cliprect, vdppri); /* draw the sprites */ @@ -243,7 +243,7 @@ VIDEO_UPDATE( system18 ) #if DEBUG_VDP if (vdp_enable && input_code_pressed(KEYCODE_V)) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); update_system18_vdp(bitmap, cliprect); } if (vdp_enable && input_code_pressed(KEYCODE_B)) diff --git a/src/mame/video/segas24.c b/src/mame/video/segas24.c index 706ee4a35a8..0c024d71343 100644 --- a/src/mame/video/segas24.c +++ b/src/mame/video/segas24.c @@ -27,14 +27,14 @@ VIDEO_UPDATE(system24) int order[12], spri[4]; if(sys24_mixer_get_reg(13) & 1) { - fillbitmap(bitmap, get_black_pen(machine), 0); + fillbitmap(bitmap, get_black_pen(screen->machine), 0); return 0; } - sys24_tile_update(machine); + sys24_tile_update(screen->machine); fillbitmap(priority_bitmap, 0, 0); - fillbitmap(bitmap, 0, &machine->screen[0].visarea); + fillbitmap(bitmap, 0, cliprect); for(i=0; i<12; i++) order[i] = i; @@ -43,7 +43,7 @@ VIDEO_UPDATE(system24) level = 0; for(i=0; i<12; i++) if(order[i] < 8) - sys24_tile_draw(machine, bitmap, cliprect, order[i], level, 0); + sys24_tile_draw(screen->machine, bitmap, cliprect, order[i], level, 0); else { spri[order[i]-8] = level; level++; diff --git a/src/mame/video/segas32.c b/src/mame/video/segas32.c index d100c4a7e26..204a0370b22 100644 --- a/src/mame/video/segas32.c +++ b/src/mame/video/segas32.c @@ -2448,20 +2448,20 @@ VIDEO_UPDATE( system32 ) /* update the visible area */ if (system32_videoram[0x1ff00/2] & 0x8000) - video_screen_set_visarea(screen, 0, 52*8-1, 0, 28*8-1); + video_screen_set_visarea(scrnum, 0, 52*8-1, 0, 28*8-1); else - video_screen_set_visarea(screen, 0, 40*8-1, 0, 28*8-1); + video_screen_set_visarea(scrnum, 0, 40*8-1, 0, 28*8-1); /* if the display is off, punt */ - if (!system32_displayenable[screen]) + if (!system32_displayenable[scrnum]) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); return 0; } /* update the tilemaps */ profiler_mark(PROFILER_USER1); - enablemask = update_tilemaps(machine, screen, cliprect); + enablemask = update_tilemaps(screen->machine, scrnum, cliprect); profiler_mark(PROFILER_END); /* debugging */ @@ -2486,50 +2486,50 @@ VIDEO_UPDATE( system32 ) FILE *f = fopen("sprite.txt", "w"); int x, y; - for (y = machine->screen[screen].visarea.min_y; y <= machine->screen[screen].visarea.max_y; y++) + for (y = screen->machine->screen[screen].visarea.min_y; y <= screen->machine->screen[screen].visarea.max_y; y++) { UINT16 *src = get_layer_scanline(MIXER_LAYER_SPRITES, y); - for (x = machine->screen[screen].visarea.min_x; x <= machine->screen[screen].visarea.max_x; x++) + for (x = screen->machine->screen[screen].visarea.min_x; x <= screen->machine->screen[screen].visarea.max_x; x++) fprintf(f, "%04X ", *src++); fprintf(f, "\n"); } fclose(f); f = fopen("nbg0.txt", "w"); - for (y = machine->screen[screen].visarea.min_y; y <= machine->screen[screen].visarea.max_y; y++) + for (y = screen->machine->screen[screen].visarea.min_y; y <= screen->machine->screen[screen].visarea.max_y; y++) { UINT16 *src = get_layer_scanline(MIXER_LAYER_NBG0, y); - for (x = machine->screen[screen].visarea.min_x; x <= machine->screen[screen].visarea.max_x; x++) + for (x = screen->machine->screen[screen].visarea.min_x; x <= screen->machine->screen[screen].visarea.max_x; x++) fprintf(f, "%04X ", *src++); fprintf(f, "\n"); } fclose(f); f = fopen("nbg1.txt", "w"); - for (y = machine->screen[screen].visarea.min_y; y <= machine->screen[screen].visarea.max_y; y++) + for (y = screen->machine->screen[screen].visarea.min_y; y <= screen->machine->screen[screen].visarea.max_y; y++) { UINT16 *src = get_layer_scanline(MIXER_LAYER_NBG1, y); - for (x = machine->screen[screen].visarea.min_x; x <= machine->screen[screen].visarea.max_x; x++) + for (x = screen->machine->screen[screen].visarea.min_x; x <= screen->machine->screen[screen].visarea.max_x; x++) fprintf(f, "%04X ", *src++); fprintf(f, "\n"); } fclose(f); f = fopen("nbg2.txt", "w"); - for (y = machine->screen[screen].visarea.min_y; y <= machine->screen[screen].visarea.max_y; y++) + for (y = screen->machine->screen[screen].visarea.min_y; y <= screen->machine->screen[screen].visarea.max_y; y++) { UINT16 *src = get_layer_scanline(MIXER_LAYER_NBG2, y); - for (x = machine->screen[screen].visarea.min_x; x <= machine->screen[screen].visarea.max_x; x++) + for (x = screen->machine->screen[screen].visarea.min_x; x <= screen->machine->screen[screen].visarea.max_x; x++) fprintf(f, "%04X ", *src++); fprintf(f, "\n"); } fclose(f); f = fopen("nbg3.txt", "w"); - for (y = machine->screen[screen].visarea.min_y; y <= machine->screen[screen].visarea.max_y; y++) + for (y = screen->machine->screen[screen].visarea.min_y; y <= screen->machine->screen[screen].visarea.max_y; y++) { UINT16 *src = get_layer_scanline(MIXER_LAYER_NBG3, y); - for (x = machine->screen[screen].visarea.min_x; x <= machine->screen[screen].visarea.max_x; x++) + for (x = screen->machine->screen[screen].visarea.min_x; x <= screen->machine->screen[screen].visarea.max_x; x++) fprintf(f, "%04X ", *src++); fprintf(f, "\n"); } @@ -2580,7 +2580,7 @@ for (showclip = 0; showclip < 4; showclip++) if (clips & (1 << i)) { rectangle rect; - pen_t white = get_white_pen(machine); + pen_t white = get_white_pen(screen->machine); if (!flip) { rect.min_x = system32_videoram[0x1ff60/2 + i * 4] & 0x1ff; @@ -2590,12 +2590,12 @@ for (showclip = 0; showclip < 4; showclip++) } else { - rect.max_x = (machine->screen[screen].visarea.max_x + 1) - (system32_videoram[0x1ff60/2 + i * 4] & 0x1ff); - rect.max_y = (machine->screen[screen].visarea.max_y + 1) - (system32_videoram[0x1ff62/2 + i * 4] & 0x0ff); - rect.min_x = (machine->screen[screen].visarea.max_x + 1) - ((system32_videoram[0x1ff64/2 + i * 4] & 0x1ff) + 1); - rect.min_y = (machine->screen[screen].visarea.max_y + 1) - ((system32_videoram[0x1ff66/2 + i * 4] & 0x0ff) + 1); + rect.max_x = (screen->machine->screen[screen].visarea.max_x + 1) - (system32_videoram[0x1ff60/2 + i * 4] & 0x1ff); + rect.max_y = (screen->machine->screen[screen].visarea.max_y + 1) - (system32_videoram[0x1ff62/2 + i * 4] & 0x0ff); + rect.min_x = (screen->machine->screen[screen].visarea.max_x + 1) - ((system32_videoram[0x1ff64/2 + i * 4] & 0x1ff) + 1); + rect.min_y = (screen->machine->screen[screen].visarea.max_y + 1) - ((system32_videoram[0x1ff66/2 + i * 4] & 0x0ff) + 1); } - sect_rect(&rect, &machine->screen[screen].visarea); + sect_rect(&rect, &screen->machine->screen[screen].visarea); if (rect.min_y <= rect.max_y && rect.min_x <= rect.max_x) { @@ -2627,20 +2627,20 @@ VIDEO_UPDATE( multi32 ) /* update the visible area */ if (system32_videoram[0x1ff00/2] & 0x8000) - video_screen_set_visarea(screen, 0, 52*8-1, 0, 28*8-1); + video_screen_set_visarea(scrnum, 0, 52*8-1, 0, 28*8-1); else - video_screen_set_visarea(screen, 0, 40*8-1, 0, 28*8-1); + video_screen_set_visarea(scrnum, 0, 40*8-1, 0, 28*8-1); /* if the display is off, punt */ - if (!system32_displayenable[screen]) + if (!system32_displayenable[scrnum]) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); return 0; } /* update the tilemaps */ profiler_mark(PROFILER_USER1); - enablemask = update_tilemaps(machine, screen, cliprect); + enablemask = update_tilemaps(screen->machine, scrnum, cliprect); profiler_mark(PROFILER_END); /* debugging */ @@ -2655,7 +2655,7 @@ VIDEO_UPDATE( multi32 ) /* do the mixing */ profiler_mark(PROFILER_USER3); - mix_all_layers(screen, 0, bitmap, cliprect, enablemask); + mix_all_layers(scrnum, 0, bitmap, cliprect, enablemask); profiler_mark(PROFILER_END); if (!input_code_pressed(KEYCODE_M)) print_mixer_data(0); @@ -2667,10 +2667,10 @@ VIDEO_UPDATE( multi32 ) FILE *f = fopen("sprite.txt", "w"); int x, y; - for (y = machine->screen[screen].visarea.min_y; y <= machine->screen[screen].visarea.max_y; y++) + for (y = screen->machine->screen[screen].visarea.min_y; y <= screen->machine->screen[screen].visarea.max_y; y++) { UINT16 *src = get_layer_scanline(MIXER_LAYER_SPRITES, y); - for (x = machine->screen[screen].visarea.min_x; x <= machine->screen[screen].visarea.max_x; x++) + for (x = screen->machine->screen[screen].visarea.min_x; x <= screen->machine->screen[screen].visarea.max_x; x++) fprintf(f, "%04X ", *src++); fprintf(f, "\n"); } diff --git a/src/mame/video/segasyse.c b/src/mame/video/segasyse.c index b5a4a33b446..47316dbb8fb 100644 --- a/src/mame/video/segasyse.c +++ b/src/mame/video/segasyse.c @@ -75,7 +75,7 @@ VIDEO_UPDATE( megaplay_normal ) segae_drawscanline(i-16,0,0); for (i = miny;i <= maxy;i++) - draw_scanline8(bitmap,32,i,256,&cache_bitmap[(i-16) * (16+256+16) +24],&machine->pens[palette_base],0); + draw_scanline8(bitmap,32,i,256,&cache_bitmap[(i-16) * (16+256+16) +24],&screen->machine->pens[palette_base],0); return 0; } diff --git a/src/mame/video/segaxbd.c b/src/mame/video/segaxbd.c index 6015a109517..440900589f1 100644 --- a/src/mame/video/segaxbd.c +++ b/src/mame/video/segaxbd.c @@ -68,7 +68,7 @@ VIDEO_UPDATE( xboard ) /* if no drawing is happening, fill with black and get out */ if (!segaic16_display_enable) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); return 0; } @@ -81,20 +81,20 @@ VIDEO_UPDATE( xboard ) segaic16_road_draw(0, bitmap, cliprect, SEGAIC16_ROAD_FOREGROUND); /* draw background */ - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0, 0x01); - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 1, 0x02); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0, 0x01); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 1, 0x02); /* draw foreground */ - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 0, 0x02); - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 1, 0x04); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 0, 0x02); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_FOREGROUND, 1, 0x04); /* draw the high priority road */ if (road_priority == 1) segaic16_road_draw(0, bitmap, cliprect, SEGAIC16_ROAD_FOREGROUND); /* text layer */ - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 0, 0x04); - segaic16_tilemap_draw(machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 1, 0x08); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 0, 0x04); + segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_TEXT, 1, 0x08); /* draw the sprites */ segaic16_sprites_draw(0, bitmap, cliprect); diff --git a/src/mame/video/segaybd.c b/src/mame/video/segaybd.c index a2a49d382d8..1b27d3c5309 100644 --- a/src/mame/video/segaybd.c +++ b/src/mame/video/segaybd.c @@ -57,7 +57,7 @@ VIDEO_UPDATE( yboard ) /* if no drawing is happening, fill with black and get out */ if (!segaic16_display_enable) { - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); return 0; } diff --git a/src/mame/video/seibuspi.c b/src/mame/video/seibuspi.c index 4cfcc8fed31..06ff75a72f4 100644 --- a/src/mame/video/seibuspi.c +++ b/src/mame/video/seibuspi.c @@ -629,38 +629,28 @@ VIDEO_UPDATE( spi ) fillbitmap(bitmap, 0, cliprect); if (!(layer_enable & 0x1)) - { - combine_tilemap(machine, bitmap, cliprect, back_layer, spi_scrollram[0] & 0xffff, (spi_scrollram[0] >> 16) & 0xffff, 1, back_rowscroll); - } + combine_tilemap(screen->machine, bitmap, cliprect, back_layer, spi_scrollram[0] & 0xffff, (spi_scrollram[0] >> 16) & 0xffff, 1, back_rowscroll); - draw_sprites(machine, bitmap, cliprect, 0); + draw_sprites(screen->machine, bitmap, cliprect, 0); // if fore layer is enabled, draw priority 1 sprites behind mid layer if (!(layer_enable & 0x4)) - { - draw_sprites(machine, bitmap, cliprect, 1); - } + draw_sprites(screen->machine, bitmap, cliprect, 1); if (!(layer_enable & 0x2)) - { - combine_tilemap(machine, bitmap, cliprect, mid_layer, spi_scrollram[1] & 0xffff, (spi_scrollram[1] >> 16) & 0xffff, 0, mid_rowscroll); - } + combine_tilemap(screen->machine, bitmap, cliprect, mid_layer, spi_scrollram[1] & 0xffff, (spi_scrollram[1] >> 16) & 0xffff, 0, mid_rowscroll); // if fore layer is disabled, draw priority 1 sprites above mid layer if ((layer_enable & 0x4)) - { - draw_sprites(machine, bitmap, cliprect, 1); - } + draw_sprites(screen->machine, bitmap, cliprect, 1); - draw_sprites(machine, bitmap, cliprect, 2); + draw_sprites(screen->machine, bitmap, cliprect, 2); if (!(layer_enable & 0x4)) - { - combine_tilemap(machine, bitmap, cliprect, fore_layer, spi_scrollram[2] & 0xffff, (spi_scrollram[2] >> 16) & 0xffff, 0, fore_rowscroll); - } + combine_tilemap(screen->machine, bitmap, cliprect, fore_layer, spi_scrollram[2] & 0xffff, (spi_scrollram[2] >> 16) & 0xffff, 0, fore_rowscroll); - draw_sprites(machine, bitmap, cliprect, 3); + draw_sprites(screen->machine, bitmap, cliprect, 3); - combine_tilemap(machine, bitmap, cliprect, text_layer, 0, 0, 0, NULL); + combine_tilemap(screen->machine, bitmap, cliprect, text_layer, 0, 0, 0, NULL); return 0; } diff --git a/src/mame/video/seicross.c b/src/mame/video/seicross.c index df50fa3b08a..93c2ddba16f 100644 --- a/src/mame/video/seicross.c +++ b/src/mame/video/seicross.c @@ -139,11 +139,9 @@ VIDEO_UPDATE( seicross ) int col; for (col = 0; col < 32; col++) - { tilemap_set_scrolly(bg_tilemap, col, seicross_row_scroll[col]); - } tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/sengokmj.c b/src/mame/video/sengokmj.c index 0cb55e2d95a..3c6e86a5152 100644 --- a/src/mame/video/sengokmj.c +++ b/src/mame/video/sengokmj.c @@ -118,12 +118,12 @@ VIDEO_START( sengokmj ) VIDEO_UPDATE( sengokmj ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect, 2); - draw_sprites(machine, bitmap,cliprect, 1); + draw_sprites(screen->machine, bitmap,cliprect, 2); + draw_sprites(screen->machine, bitmap,cliprect, 1); tilemap_draw(bitmap,cliprect,md_tilemap,0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect, 0); - draw_sprites(machine, bitmap,cliprect, 3); + draw_sprites(screen->machine, bitmap,cliprect, 0); + draw_sprites(screen->machine, bitmap,cliprect, 3); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; } diff --git a/src/mame/video/senjyo.c b/src/mame/video/senjyo.c index 3b110fed2fb..de06d1460fe 100644 --- a/src/mame/video/senjyo.c +++ b/src/mame/video/senjyo.c @@ -301,8 +301,8 @@ VIDEO_UPDATE( senjyo ) /* two colors for the radar dots (verified on the real board) */ - palette_set_color(machine,512,MAKE_RGB(0xff,0x00,0x00)); /* red for enemies */ - palette_set_color(machine,513,MAKE_RGB(0xff,0xff,0x00)); /* yellow for player */ + palette_set_color(screen->machine,512,MAKE_RGB(0xff,0x00,0x00)); /* red for enemies */ + palette_set_color(screen->machine,513,MAKE_RGB(0xff,0xff,0x00)); /* yellow for player */ { int scrollx,scrolly; @@ -337,14 +337,14 @@ VIDEO_UPDATE( senjyo ) tilemap_set_scrolly(bg3_tilemap,0,scrolly); } - draw_bgbitmap(machine, bitmap,cliprect); - draw_sprites(machine, bitmap,cliprect,0); + draw_bgbitmap(screen->machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,bg3_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect,1); + draw_sprites(screen->machine, bitmap,cliprect,1); tilemap_draw(bitmap,cliprect,bg2_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect,2); + draw_sprites(screen->machine, bitmap,cliprect,2); tilemap_draw(bitmap,cliprect,bg1_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect,3); + draw_sprites(screen->machine, bitmap,cliprect,3); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); draw_radar(bitmap,cliprect); diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c index 88c621d588a..d60235291b4 100644 --- a/src/mame/video/seta.c +++ b/src/mame/video/seta.c @@ -887,9 +887,9 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan /* For games without tilemaps */ VIDEO_UPDATE( seta_no_layers ) { - set_pens(machine); + set_pens(screen->machine); fillbitmap(bitmap,0x1f0,cliprect); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } @@ -903,7 +903,7 @@ static VIDEO_UPDATE( seta_layers ) int order = 0; int flip = (spriteram16[ 0x600/2 ] & 0x40) >> 6; - int vis_dimy = machine->screen[0].visarea.max_y - machine->screen[0].visarea.min_y + 1; + int vis_dimy = screen->machine->screen[0].visarea.max_y - screen->machine->screen[0].visarea.min_y + 1; flip ^= tilemaps_flip; @@ -989,7 +989,7 @@ if (input_code_pressed(KEYCODE_Z)) if (order & 2) // layer-sprite priority? { - if (layers_ctrl & 8) draw_sprites(machine,bitmap,cliprect); + if (layers_ctrl & 8) draw_sprites(screen->machine,bitmap,cliprect); if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect, tilemap_0, 0, 0); if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect, tilemap_1, 0, 0); } @@ -997,7 +997,7 @@ if (input_code_pressed(KEYCODE_Z)) { if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect, tilemap_0, 0, 0); if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect, tilemap_1, 0, 0); - if (layers_ctrl & 8) draw_sprites(machine, bitmap,cliprect); + if (layers_ctrl & 8) draw_sprites(screen->machine, bitmap,cliprect); } } else @@ -1007,7 +1007,7 @@ if (input_code_pressed(KEYCODE_Z)) if (order & 2) // layer-sprite priority? { - if (layers_ctrl & 8) draw_sprites(machine, bitmap,cliprect); + if (layers_ctrl & 8) draw_sprites(screen->machine, bitmap,cliprect); if (tilemap_2) { @@ -1023,7 +1023,7 @@ if (input_code_pressed(KEYCODE_Z)) if (layers_ctrl & 2) tilemap_draw(bitmap,cliprect, tilemap_3, 0, 0); } - if (layers_ctrl & 8) draw_sprites(machine, bitmap,cliprect); + if (layers_ctrl & 8) draw_sprites(screen->machine, bitmap,cliprect); } } return 0; @@ -1032,14 +1032,14 @@ if (input_code_pressed(KEYCODE_Z)) VIDEO_UPDATE( seta ) { - set_pens(machine); + set_pens(screen->machine); return VIDEO_UPDATE_CALL(seta_layers); } VIDEO_UPDATE( usclssic ) { - usclssic_set_pens(machine->colortable); + usclssic_set_pens(screen->machine->colortable); return VIDEO_UPDATE_CALL(seta_layers); } diff --git a/src/mame/video/seta2.c b/src/mame/video/seta2.c index 7e3739ad59f..fd4f9b44f04 100644 --- a/src/mame/video/seta2.c +++ b/src/mame/video/seta2.c @@ -379,7 +379,7 @@ VIDEO_UPDATE( seta2 ) if (seta2_vregs[0x30/2] & 1) return 0; // BLANK SCREEN - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/sf.c b/src/mame/video/sf.c index 936f7d50b3a..3d8a9a3ce2e 100644 --- a/src/mame/video/sf.c +++ b/src/mame/video/sf.c @@ -233,7 +233,7 @@ VIDEO_UPDATE( sf ) tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); if (sf_active & 0x80) - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; diff --git a/src/mame/video/shadfrce.c b/src/mame/video/shadfrce.c index fb15b87a581..58f3956afb4 100644 --- a/src/mame/video/shadfrce.c +++ b/src/mame/video/shadfrce.c @@ -155,7 +155,7 @@ VIDEO_UPDATE( shadfrce ) tilemap_draw(bitmap,cliprect,shadfrce_bg1tilemap,0,0); tilemap_draw(bitmap,cliprect,shadfrce_bg0tilemap,0,1); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,shadfrce_fgtilemap, 0,0); diff --git a/src/mame/video/shangkid.c b/src/mame/video/shangkid.c index 503dc1e0420..e9ba17beb75 100644 --- a/src/mame/video/shangkid.c +++ b/src/mame/video/shangkid.c @@ -172,7 +172,7 @@ VIDEO_UPDATE( shangkid ) tilemap_set_scrolly( background,0,shangkid_videoreg[2]+0x10 ); tilemap_draw( bitmap,cliprect,background,0,0 ); - shangkid_draw_sprites( machine, bitmap,cliprect ); + shangkid_draw_sprites(screen->machine, bitmap,cliprect ); tilemap_draw( bitmap,cliprect,background,1,0 ); /* high priority tiles */ return 0; } @@ -300,8 +300,8 @@ static void dynamski_draw_sprites(running_machine *machine, bitmap_t *bitmap, co VIDEO_UPDATE( dynamski ) { - dynamski_draw_background( machine, bitmap,cliprect, 0 ); - dynamski_draw_sprites(machine, bitmap,cliprect ); - dynamski_draw_background( machine, bitmap,cliprect, 1 ); + dynamski_draw_background(screen->machine, bitmap,cliprect, 0 ); + dynamski_draw_sprites(screen->machine, bitmap,cliprect ); + dynamski_draw_background(screen->machine, bitmap,cliprect, 1 ); return 0; } diff --git a/src/mame/video/shaolins.c b/src/mame/video/shaolins.c index cfc09008110..f612753e218 100644 --- a/src/mame/video/shaolins.c +++ b/src/mame/video/shaolins.c @@ -185,6 +185,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( shaolins ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/shisen.c b/src/mame/video/shisen.c index 09ed4363619..48904e63ebb 100644 --- a/src/mame/video/shisen.c +++ b/src/mame/video/shisen.c @@ -61,6 +61,6 @@ VIDEO_START( sichuan2 ) VIDEO_UPDATE( sichuan2 ) { - tilemap_draw(bitmap, &machine->screen[0].visarea, bg_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/shootout.c b/src/mame/video/shootout.c index 3b8c7c62ba3..826e8ad9c05 100644 --- a/src/mame/video/shootout.c +++ b/src/mame/video/shootout.c @@ -160,7 +160,7 @@ VIDEO_UPDATE( shootout ) tilemap_draw(bitmap,cliprect,background,0,0); tilemap_draw(bitmap,cliprect,foreground,0,1); - draw_sprites(machine, bitmap,cliprect,3/*bank bits */); + draw_sprites(screen->machine, bitmap,cliprect,3/*bank bits */); return 0; } @@ -170,6 +170,6 @@ VIDEO_UPDATE( shootouj ) tilemap_draw(bitmap,cliprect,background,0,0); tilemap_draw(bitmap,cliprect,foreground,0,1); - draw_sprites(machine, bitmap,cliprect,2/*bank bits*/); + draw_sprites(screen->machine, bitmap,cliprect,2/*bank bits*/); return 0; } diff --git a/src/mame/video/shuuz.c b/src/mame/video/shuuz.c index eeb49759497..68e317218a0 100644 --- a/src/mame/video/shuuz.c +++ b/src/mame/video/shuuz.c @@ -97,7 +97,7 @@ VIDEO_UPDATE( shuuz ) tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); /* draw and merge the MO */ - mobitmap = atarimo_render(machine, 0, cliprect, &rectlist); + mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) { diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c index 4b10eeb3e2b..e5402244e47 100644 --- a/src/mame/video/sidearms.c +++ b/src/mame/video/sidearms.c @@ -351,7 +351,7 @@ VIDEO_UPDATE( sidearms ) tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); if (objon) - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); if (charon) tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); diff --git a/src/mame/video/sidepckt.c b/src/mame/video/sidepckt.c index 4894d3e096b..886c2d75caf 100644 --- a/src/mame/video/sidepckt.c +++ b/src/mame/video/sidepckt.c @@ -143,7 +143,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( sidepckt ) { tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0,0); return 0; } diff --git a/src/mame/video/silkroad.c b/src/mame/video/silkroad.c index bc653272d8b..3d3cb3bb2cf 100644 --- a/src/mame/video/silkroad.c +++ b/src/mame/video/silkroad.c @@ -151,7 +151,7 @@ static int enable1=1,enable2=1,enable3=1; VIDEO_UPDATE(silkroad) { - fillbitmap(bitmap,0x7c0,&machine->screen[0].visarea); + fillbitmap(bitmap,0x7c0,cliprect); tilemap_set_scrollx( fg_tilemap, 0, ((silkroad_regs[0] & 0xffff0000) >> 16) ); tilemap_set_scrolly( fg_tilemap, 0, (silkroad_regs[0] & 0x0000ffff) >> 0 ); @@ -170,10 +170,10 @@ VIDEO_UPDATE(silkroad) if(enable1) tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect,0); + draw_sprites(screen->machine, bitmap,cliprect,0); if(enable2) tilemap_draw(bitmap,cliprect,fg2_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect,1); + draw_sprites(screen->machine, bitmap,cliprect,1); if(enable3) tilemap_draw(bitmap,cliprect,fg3_tilemap,0,0); /* diff --git a/src/mame/video/simpl156.c b/src/mame/video/simpl156.c index 2803f82202b..fe22a7c021b 100644 --- a/src/mame/video/simpl156.c +++ b/src/mame/video/simpl156.c @@ -122,7 +122,7 @@ VIDEO_UPDATE( simpl156 ) deco16_tilemap_2_draw(bitmap,cliprect,0,2); deco16_tilemap_1_draw(bitmap,cliprect,0,4); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/simpsons.c b/src/mame/video/simpsons.c index 47e335dfed1..4db307e3b9f 100644 --- a/src/mame/video/simpsons.c +++ b/src/mame/video/simpsons.c @@ -167,6 +167,6 @@ VIDEO_UPDATE( simpsons ) tilemap_draw(bitmap,cliprect,K052109_tilemap[layer[1]],0,2); tilemap_draw(bitmap,cliprect,K052109_tilemap[layer[2]],0,4); - K053247_sprites_draw(machine, bitmap,cliprect); + K053247_sprites_draw(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/skullxbo.c b/src/mame/video/skullxbo.c index 48b352f2ea5..a7ecbefff35 100644 --- a/src/mame/video/skullxbo.c +++ b/src/mame/video/skullxbo.c @@ -244,7 +244,7 @@ VIDEO_UPDATE( skullxbo ) tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); /* draw and merge the MO */ - mobitmap = atarimo_render(machine, 0, cliprect, &rectlist); + mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) { diff --git a/src/mame/video/skydiver.c b/src/mame/video/skydiver.c index a82d8a0c685..a1f216ceb8a 100644 --- a/src/mame/video/skydiver.c +++ b/src/mame/video/skydiver.c @@ -207,6 +207,6 @@ VIDEO_UPDATE( skydiver ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/skyfox.c b/src/mame/video/skyfox.c index 1c9f8553b70..b0facf8c109 100644 --- a/src/mame/video/skyfox.c +++ b/src/mame/video/skyfox.c @@ -289,6 +289,6 @@ VIDEO_UPDATE( skyfox ) { fillbitmap(bitmap,255,cliprect); // the bg is black draw_background(bitmap, cliprect); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/skykid.c b/src/mame/video/skykid.c index 25778ada265..c834905d40d 100644 --- a/src/mame/video/skykid.c +++ b/src/mame/video/skykid.c @@ -248,11 +248,11 @@ VIDEO_UPDATE( skykid ) tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); if ((priority & 0xf0) != 0x50) - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); if ((priority & 0xf0) == 0x50) - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/skyraid.c b/src/mame/video/skyraid.c index 08d95b7b1a2..410738a967c 100644 --- a/src/mame/video/skyraid.c +++ b/src/mame/video/skyraid.c @@ -144,9 +144,9 @@ VIDEO_UPDATE( skyraid ) fillbitmap(bitmap, 0, cliprect); draw_terrain(helper, cliprect); - draw_sprites(machine, helper, cliprect); - draw_missiles(machine, helper, cliprect); + draw_sprites(screen->machine, helper, cliprect); + draw_missiles(screen->machine, helper, cliprect); draw_trapezoid(bitmap, helper); - draw_text(machine, bitmap, cliprect); + draw_text(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/slapfght.c b/src/mame/video/slapfght.c index 8335ec6f35e..5f98a408c01 100644 --- a/src/mame/video/slapfght.c +++ b/src/mame/video/slapfght.c @@ -195,9 +195,9 @@ VIDEO_UPDATE( perfrman ) } tilemap_draw(bitmap,cliprect,pf1_tilemap,TILEMAP_DRAW_OPAQUE,0); - draw_sprites(machine, bitmap,cliprect,0); + draw_sprites(screen->machine, bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,pf1_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect,0x80); + draw_sprites(screen->machine, bitmap,cliprect,0x80); #ifdef MAME_DEBUG slapfght_log_vram(); @@ -230,14 +230,14 @@ VIDEO_UPDATE( slapfight ) for (offs = 0;offs < spriteram_size;offs += 4) { if (flipscreen) - drawgfx(bitmap,machine->gfx[2], + drawgfx(bitmap,screen->machine->gfx[2], buffered_spriteram[offs] + ((buffered_spriteram[offs+2] & 0xc0) << 2), (buffered_spriteram[offs+2] & 0x1e) >> 1, 1,1, 288-(buffered_spriteram[offs+1] + ((buffered_spriteram[offs+2] & 0x01) << 8)) +18,240-buffered_spriteram[offs+3], cliprect,TRANSPARENCY_PEN,0); else - drawgfx(bitmap,machine->gfx[2], + drawgfx(bitmap,screen->machine->gfx[2], buffered_spriteram[offs] + ((buffered_spriteram[offs+2] & 0xc0) << 2), (buffered_spriteram[offs+2] & 0x1e) >> 1, 0,0, diff --git a/src/mame/video/slapshot.c b/src/mame/video/slapshot.c index ceb4d38bf8b..3a1b5101595 100644 --- a/src/mame/video/slapshot.c +++ b/src/mame/video/slapshot.c @@ -557,7 +557,7 @@ VIDEO_UPDATE( slapshot ) taito_handle_sprite_buffering(); - TC0480SCP_tilemap_update(machine); + TC0480SCP_tilemap_update(screen->machine); priority = TC0480SCP_get_bg_priority(); @@ -615,7 +615,7 @@ VIDEO_UPDATE( slapshot ) if (spritepri[i] < tilepri[(layer[3])]) primasks[i] |= 0xff00; } - draw_sprites(machine,bitmap,cliprect,primasks,0); + draw_sprites(screen->machine,bitmap,cliprect,primasks,0); } /* diff --git a/src/mame/video/snk.c b/src/mame/video/snk.c index 403d268927e..4a887ce87ff 100644 --- a/src/mame/video/snk.c +++ b/src/mame/video/snk.c @@ -217,7 +217,7 @@ VIDEO_UPDATE( tnk3 ) int bg_scrolly = -ram[0xcb00] + 8; if(attributes & 0x02) bg_scrollx += 256; if(attributes & 0x10) bg_scrolly += 256; - tnk3_draw_background( machine, bitmap, cliprect, bg_scrollx, bg_scrolly, 64, 64, 0 ); + tnk3_draw_background(screen->machine, bitmap, cliprect, bg_scrollx, bg_scrolly, 64, 64, 0 ); } { @@ -225,14 +225,14 @@ VIDEO_UPDATE( tnk3 ) int sp_scrolly = ram[0xc900] + 9; if(attributes & 0x01) sp_scrollx += 256; if(attributes & 0x08) sp_scrolly += 256; - tnk3_draw_sprites( machine, bitmap, cliprect, sp_scrollx, sp_scrolly ); + tnk3_draw_sprites(screen->machine, bitmap, cliprect, sp_scrollx, sp_scrolly ); } { int bank = (attributes & 0x40) ? 1:0; - tnk3_draw_text( machine, bitmap, cliprect, bank, &ram[0xf800] ); - tnk3_draw_status( machine, bitmap, cliprect, bank, &ram[0xfc00] ); + tnk3_draw_text(screen->machine, bitmap, cliprect, bank, &ram[0xf800] ); + tnk3_draw_status(screen->machine, bitmap, cliprect, bank, &ram[0xfc00] ); } return 0; } @@ -276,15 +276,15 @@ VIDEO_UPDATE( sgladiat ) scrolly = -pMem[0xd600]; scrollx += 15; scrolly += 8; - sgladiat_draw_background( machine, bitmap, cliprect, scrollx, scrolly ); + sgladiat_draw_background(screen->machine, bitmap, cliprect, scrollx, scrolly ); scrollx = pMem[0xd500] + ((attributes & 1) ? 256:0); scrolly = pMem[0xd400]; scrollx += 29; scrolly += 9; - tnk3_draw_sprites( machine, bitmap, cliprect, scrollx, scrolly ); + tnk3_draw_sprites(screen->machine, bitmap, cliprect, scrollx, scrolly ); - tnk3_draw_text( machine, bitmap, cliprect, 0, &pMem[0xf000] ); + tnk3_draw_text(screen->machine, bitmap, cliprect, 0, &pMem[0xf000] ); return 0; } @@ -336,7 +336,7 @@ VIDEO_UPDATE( ikari ) int attributes = ram[0xc900]; int scrolly = 8-ram[0xc800] - ((attributes & 0x01) ? 256:0); int scrollx = 13-ram[0xc880] - ((attributes & 0x02) ? 256:0); - tnk3_draw_background( machine, bitmap, cliprect, scrollx, scrolly, 32, 32, 1 ); + tnk3_draw_background(screen->machine, bitmap, cliprect, scrollx, scrolly, 32, 32, 1 ); } { @@ -348,13 +348,13 @@ VIDEO_UPDATE( ikari ) int sp32_scrolly = 9 + ram[0xcb00] + ((attributes & 0x08) ? 256:0); int sp32_scrollx = 28 + ram[0xcb80] + ((attributes & 0x20) ? 256:0); - ikari_draw_sprites( machine, bitmap, cliprect, 0, sp16_scrollx, sp16_scrolly, &ram[0xe800], 2 ); - ikari_draw_sprites( machine, bitmap, cliprect, 0, sp32_scrollx, sp32_scrolly, &ram[0xe000], 3 ); - ikari_draw_sprites( machine, bitmap, cliprect, 25, sp16_scrollx, sp16_scrolly, &ram[0xe800], 2 ); + ikari_draw_sprites(screen->machine, bitmap, cliprect, 0, sp16_scrollx, sp16_scrolly, &ram[0xe800], 2 ); + ikari_draw_sprites(screen->machine, bitmap, cliprect, 0, sp32_scrollx, sp32_scrolly, &ram[0xe000], 3 ); + ikari_draw_sprites(screen->machine, bitmap, cliprect, 25, sp16_scrollx, sp16_scrolly, &ram[0xe800], 2 ); } - tnk3_draw_text( machine, bitmap, cliprect, -1, &ram[0xf800] ); - tnk3_draw_status( machine, bitmap, cliprect, -1, &ram[0xfc00] ); + tnk3_draw_text(screen->machine, bitmap, cliprect, -1, &ram[0xf800] ); + tnk3_draw_status(screen->machine, bitmap, cliprect, -1, &ram[0xfc00] ); return 0; } @@ -519,19 +519,19 @@ VIDEO_UPDATE( tdfever ) sp_scroll_x += 40; sp_scroll_y += -31; } - tdfever_draw_bg( machine, bitmap, cliprect, bg_scroll_x, bg_scroll_y ); + tdfever_draw_bg(screen->machine, bitmap, cliprect, bg_scroll_x, bg_scroll_y ); if (snk_gamegroup == 5) // tdfeverj { gfx_drawmode_table[13] = DRAWMODE_SHADOW; gfx_drawmode_table[14] = DRAWMODE_SOURCE; - for (i=0x10e; i<0x200; i+=0x10) palette_set_color(machine,i,MAKE_RGB(snk_blink_parity,snk_blink_parity,snk_blink_parity)); + for (i=0x10e; i<0x200; i+=0x10) palette_set_color(screen->machine,i,MAKE_RGB(snk_blink_parity,snk_blink_parity,snk_blink_parity)); snk_blink_parity ^= 0x7f; } - tdfever_draw_sp( machine, bitmap, cliprect, sp_scroll_x, sp_scroll_y, 0 ); + tdfever_draw_sp(screen->machine, bitmap, cliprect, sp_scroll_x, sp_scroll_y, 0 ); - tdfever_draw_tx( machine, bitmap, cliprect, tx_attributes, 0, 0, 0xf800 ); + tdfever_draw_tx(screen->machine, bitmap, cliprect, tx_attributes, 0, 0, 0xf800 ); return 0; } @@ -563,7 +563,7 @@ VIDEO_UPDATE( gwar ) bg_scroll_x += (bg_attribute & 2) ? 256:0; bg_scroll_y += (bg_attribute & 1) ? 256:0; - tdfever_draw_bg( machine, bitmap, cliprect, bg_scroll_x, bg_scroll_y ); + tdfever_draw_bg(screen->machine, bitmap, cliprect, bg_scroll_x, bg_scroll_y ); } { @@ -591,19 +591,19 @@ VIDEO_UPDATE( gwar ) if(sp_attribute & 0xf8) // improves priority { - tdfever_draw_sp( machine, bitmap, cliprect, sp16_x, sp16_y, 2 ); - tdfever_draw_sp( machine, bitmap, cliprect, sp32_x, sp32_y, 1 ); + tdfever_draw_sp(screen->machine, bitmap, cliprect, sp16_x, sp16_y, 2 ); + tdfever_draw_sp(screen->machine, bitmap, cliprect, sp32_x, sp32_y, 1 ); } else { - tdfever_draw_sp( machine, bitmap, cliprect, sp32_x, sp32_y, 1 ); - tdfever_draw_sp( machine, bitmap, cliprect, sp16_x, sp16_y, 2 ); + tdfever_draw_sp(screen->machine, bitmap, cliprect, sp32_x, sp32_y, 1 ); + tdfever_draw_sp(screen->machine, bitmap, cliprect, sp16_x, sp16_y, 2 ); } } { UINT8 text_attribute = ram[gwar_sp_baseaddr+0x8c0]; - tdfever_draw_tx( machine, bitmap, cliprect, text_attribute, 0, 0, gwar_tx_baseaddr ); + tdfever_draw_tx(screen->machine, bitmap, cliprect, text_attribute, 0, 0, gwar_tx_baseaddr ); } return 0; } diff --git a/src/mame/video/snk68.c b/src/mame/video/snk68.c index 74d49cea10f..f38ecaeb434 100644 --- a/src/mame/video/snk68.c +++ b/src/mame/video/snk68.c @@ -205,12 +205,12 @@ VIDEO_UPDATE( pow ) fillbitmap(bitmap,2047,cliprect); /* This appears to be correct priority */ - draw_sprites(machine, bitmap,cliprect,1,0x000); - draw_sprites(machine, bitmap,cliprect,1,0x800); - draw_sprites(machine, bitmap,cliprect,2,0x000); - draw_sprites(machine, bitmap,cliprect,2,0x800); - draw_sprites(machine, bitmap,cliprect,0,0x000); //AT: (pow37b5yel) - draw_sprites(machine, bitmap,cliprect,0,0x800); + draw_sprites(screen->machine, bitmap,cliprect,1,0x000); + draw_sprites(screen->machine, bitmap,cliprect,1,0x800); + draw_sprites(screen->machine, bitmap,cliprect,2,0x000); + draw_sprites(screen->machine, bitmap,cliprect,2,0x800); + draw_sprites(screen->machine, bitmap,cliprect,0,0x000); //AT: (pow37b5yel) + draw_sprites(screen->machine, bitmap,cliprect,0,0x800); tilemap_draw(bitmap,cliprect,fix_tilemap,0,0); return 0; @@ -287,12 +287,12 @@ VIDEO_UPDATE( searchar ) fillbitmap(bitmap,2047,cliprect); /* This appears to be correct priority */ - draw_sprites2(machine, bitmap,cliprect,8,0x2000,0x000); - draw_sprites2(machine, bitmap,cliprect,8,0x2000,0x800); - draw_sprites2(machine, bitmap,cliprect,12,0x3000,0x000); - draw_sprites2(machine, bitmap,cliprect,12,0x3000,0x800); - draw_sprites2(machine, bitmap,cliprect,4,0x1000,0x000); - draw_sprites2(machine, bitmap,cliprect,4,0x1000,0x800); + draw_sprites2(screen->machine, bitmap,cliprect,8,0x2000,0x000); + draw_sprites2(screen->machine, bitmap,cliprect,8,0x2000,0x800); + draw_sprites2(screen->machine, bitmap,cliprect,12,0x3000,0x000); + draw_sprites2(screen->machine, bitmap,cliprect,12,0x3000,0x800); + draw_sprites2(screen->machine, bitmap,cliprect,4,0x1000,0x000); + draw_sprites2(screen->machine, bitmap,cliprect,4,0x1000,0x800); tilemap_draw(bitmap,cliprect,fix_tilemap,0,0); return 0; diff --git a/src/mame/video/solomon.c b/src/mame/video/solomon.c index 1926a468d7a..0a019916c5d 100644 --- a/src/mame/video/solomon.c +++ b/src/mame/video/solomon.c @@ -102,6 +102,6 @@ VIDEO_UPDATE( solomon ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/sonson.c b/src/mame/video/sonson.c index a3a5703c916..037653d0f0a 100644 --- a/src/mame/video/sonson.c +++ b/src/mame/video/sonson.c @@ -170,6 +170,6 @@ VIDEO_UPDATE( sonson ) tilemap_set_scrollx(bg_tilemap, row, *sonson_scroll); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/spacefb.c b/src/mame/video/spacefb.c index 5169fc2a7c4..88b0b187035 100644 --- a/src/mame/video/spacefb.c +++ b/src/mame/video/spacefb.c @@ -462,7 +462,7 @@ static void draw_objects(bitmap_t *bitmap, const rectangle *cliprect) VIDEO_UPDATE( spacefb ) { draw_objects(bitmap, cliprect); - draw_starfield(machine, screen, bitmap, cliprect); + draw_starfield(screen->machine, scrnum, bitmap, cliprect); return 0; } diff --git a/src/mame/video/spbactn.c b/src/mame/video/spbactn.c index 9f3657f4840..52461934605 100644 --- a/src/mame/video/spbactn.c +++ b/src/mame/video/spbactn.c @@ -197,7 +197,7 @@ VIDEO_UPDATE( spbactn ) colour = ((attr & 0x00f0) >> 4) | 0x80; - drawgfx(tile_bitmap_bg, machine->gfx[1], + drawgfx(tile_bitmap_bg, screen->machine->gfx[1], code, colour, 0, 0, @@ -212,7 +212,7 @@ VIDEO_UPDATE( spbactn ) } } - if (draw_sprites(machine, tile_bitmap_bg, cliprect, 0)) + if (draw_sprites(screen->machine, tile_bitmap_bg, cliprect, 0)) { /* kludge: draw table bg gfx again if priority 0 sprites are enabled */ for (sx = sy = offs = 0; offs < 0x4000 / 2; offs++) @@ -224,7 +224,7 @@ VIDEO_UPDATE( spbactn ) colour = ((attr & 0x00f0) >> 4) | 0x80; - drawgfx(tile_bitmap_bg, machine->gfx[1], + drawgfx(tile_bitmap_bg, screen->machine->gfx[1], code, colour, 0, 0, @@ -240,7 +240,7 @@ VIDEO_UPDATE( spbactn ) } } - draw_sprites(machine, tile_bitmap_bg, cliprect, 1); + draw_sprites(screen->machine, tile_bitmap_bg, cliprect, 1); /* draw table fg gfx */ for (sx = sy = offs = 0; offs < 0x4000 / 2; offs++) @@ -258,7 +258,7 @@ VIDEO_UPDATE( spbactn ) else colour |= 0x0080; - drawgfx(tile_bitmap_fg, machine->gfx[0], + drawgfx(tile_bitmap_fg, screen->machine->gfx[0], code, colour, 0, 0, @@ -272,10 +272,10 @@ VIDEO_UPDATE( spbactn ) sx = 0; } } - draw_sprites(machine, tile_bitmap_fg, cliprect, 2); - draw_sprites(machine, tile_bitmap_fg, cliprect, 3); + draw_sprites(screen->machine, tile_bitmap_fg, cliprect, 2); + draw_sprites(screen->machine, tile_bitmap_fg, cliprect, 3); /* mix & blend the tilemaps and sprites into a 32-bit bitmap */ - blendbitmaps(machine, bitmap, tile_bitmap_bg, tile_bitmap_fg, 0, 0, cliprect); + blendbitmaps(screen->machine, bitmap, tile_bitmap_bg, tile_bitmap_fg, 0, 0, cliprect); return 0; } diff --git a/src/mame/video/spcforce.c b/src/mame/video/spcforce.c index e5627baf614..e18da2a5da8 100644 --- a/src/mame/video/spcforce.c +++ b/src/mame/video/spcforce.c @@ -25,7 +25,7 @@ VIDEO_UPDATE( spcforce ) /* draw the characters as sprites because they could be overlapping */ - fillbitmap(bitmap,0,&machine->screen[0].visarea); + fillbitmap(bitmap,0,cliprect); for (offs = 0; offs < videoram_size; offs++) @@ -45,11 +45,11 @@ VIDEO_UPDATE( spcforce ) sy = 248 - sy; } - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], code, col, flip_screen_get(), flip_screen_get(), sx, sy, - &machine->screen[0].visarea,TRANSPARENCY_PEN,0); + cliprect,TRANSPARENCY_PEN,0); } return 0; } diff --git a/src/mame/video/spdodgeb.c b/src/mame/video/spdodgeb.c index bbb305d9a3f..b29850817c5 100644 --- a/src/mame/video/spdodgeb.c +++ b/src/mame/video/spdodgeb.c @@ -213,10 +213,8 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( spdodgeb ) { - tilemap_set_scrollx(bg_tilemap,0,lastscroll+5); - tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/speedbal.c b/src/mame/video/speedbal.c index 411e11cdc39..16dbb2035e7 100644 --- a/src/mame/video/speedbal.c +++ b/src/mame/video/speedbal.c @@ -128,7 +128,7 @@ VIDEO_UPDATE( speedbal ) { tilemap_draw(bitmap, cliprect, bg_tilemap, TILEMAP_DRAW_LAYER1, 0); tilemap_draw(bitmap, cliprect, fg_tilemap, TILEMAP_DRAW_LAYER1, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, bg_tilemap, TILEMAP_DRAW_LAYER0, 0); tilemap_draw(bitmap, cliprect, fg_tilemap, TILEMAP_DRAW_LAYER0, 0); return 0; diff --git a/src/mame/video/speedspn.c b/src/mame/video/speedspn.c index af7c11c226c..e8c942162a1 100644 --- a/src/mame/video/speedspn.c +++ b/src/mame/video/speedspn.c @@ -94,7 +94,7 @@ VIDEO_UPDATE(speedspn) { if (speedspn_display_disable) { - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); return 0; } @@ -108,6 +108,6 @@ VIDEO_UPDATE(speedspn) #endif tilemap_set_scrollx(speedspn_tilemap,0, 0x100); // verify tilemap_draw(bitmap,cliprect,speedspn_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/splash.c b/src/mame/video/splash.c index 086f74779e8..1a550ab8b00 100644 --- a/src/mame/video/splash.c +++ b/src/mame/video/splash.c @@ -271,7 +271,7 @@ VIDEO_UPDATE( splash ) draw_bitmap(bitmap,cliprect); tilemap_draw(bitmap,cliprect,bg_tilemap[1],0,0); - splash_draw_sprites(machine, bitmap,cliprect); + splash_draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,bg_tilemap[0],0,0); return 0; } @@ -286,7 +286,7 @@ VIDEO_UPDATE( funystrp ) tilemap_draw(bitmap,cliprect,bg_tilemap[1],0,0); /*Sprite chip is similar but not the same*/ - funystrp_draw_sprites(machine, bitmap,cliprect); + funystrp_draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,bg_tilemap[0],0,0); return 0; } diff --git a/src/mame/video/sprcros2.c b/src/mame/video/sprcros2.c index 71832d478ff..7b748ea511a 100644 --- a/src/mame/video/sprcros2.c +++ b/src/mame/video/sprcros2.c @@ -188,7 +188,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( sprcros2 ) { tilemap_draw( bitmap,cliprect,sprcros2_bgtilemap,0,0 ); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw( bitmap,cliprect,sprcros2_fgtilemap,0,0 ); return 0; } diff --git a/src/mame/video/sprint2.c b/src/mame/video/sprint2.c index 32396b6a672..69cfbb7f532 100644 --- a/src/mame/video/sprint2.c +++ b/src/mame/video/sprint2.c @@ -131,7 +131,7 @@ VIDEO_UPDATE( sprint2 ) for (i = 0; i < 4; i++) { - drawgfx(bitmap, machine->gfx[1], + drawgfx(bitmap, screen->machine->gfx[1], get_sprite_code(i), i, 0, 0, diff --git a/src/mame/video/sprint4.c b/src/mame/video/sprint4.c index bc161801153..464ee157ed9 100644 --- a/src/mame/video/sprint4.c +++ b/src/mame/video/sprint4.c @@ -77,7 +77,7 @@ VIDEO_UPDATE( sprint4 ) if (i & 1) bank = 32; - drawgfx(bitmap, machine->gfx[1], + drawgfx(bitmap, screen->machine->gfx[1], (code >> 3) | bank, (attr & 0x80) ? 4 : i, 0, 0, diff --git a/src/mame/video/sprint8.c b/src/mame/video/sprint8.c index 55f1ab3f48f..d6dee438c03 100644 --- a/src/mame/video/sprint8.c +++ b/src/mame/video/sprint8.c @@ -168,9 +168,9 @@ static TIMER_CALLBACK( sprint8_collision_callback ) VIDEO_UPDATE( sprint8 ) { - set_pens(machine->colortable); + set_pens(screen->machine->colortable); tilemap_draw(bitmap, cliprect, tilemap1, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/srmp2.c b/src/mame/video/srmp2.c index 0a3dc7dfefc..a9717a9fc57 100644 --- a/src/mame/video/srmp2.c +++ b/src/mame/video/srmp2.c @@ -435,7 +435,7 @@ static void mjyuugi_draw_sprites(running_machine *machine, bitmap_t *bitmap, con VIDEO_UPDATE( srmp2 ) { fillbitmap(bitmap, 0x1f0, cliprect); - srmp2_draw_sprites(machine, bitmap, cliprect); + srmp2_draw_sprites(screen->machine, bitmap, cliprect); return 0; } @@ -443,7 +443,7 @@ VIDEO_UPDATE( srmp2 ) VIDEO_UPDATE( srmp3 ) { fillbitmap(bitmap, 0x1f0, cliprect); - srmp3_draw_sprites(machine, bitmap, cliprect); + srmp3_draw_sprites(screen->machine, bitmap, cliprect); return 0; } @@ -451,6 +451,6 @@ VIDEO_UPDATE( srmp3 ) VIDEO_UPDATE( mjyuugi ) { fillbitmap(bitmap, 0x1f0, cliprect); - mjyuugi_draw_sprites(machine, bitmap, cliprect); + mjyuugi_draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/srumbler.c b/src/mame/video/srumbler.c index 346a800e11b..633a81b8356 100644 --- a/src/mame/video/srumbler.c +++ b/src/mame/video/srumbler.c @@ -162,7 +162,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( srumbler ) { tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); return 0; diff --git a/src/mame/video/sshangha.c b/src/mame/video/sshangha.c index edfd92b419a..e00e152f96a 100644 --- a/src/mame/video/sshangha.c +++ b/src/mame/video/sshangha.c @@ -234,18 +234,18 @@ VIDEO_UPDATE( sshangha ) tilemap_set_scrolly( pf1_16x16_tilemap,0, sshangha_control_0[2] ); if ((sshangha_control_0[5]&0x8000)==0) - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); /* Super Shanghai has a mode where the two tilemaps are combined to produce a 6bpp tilemap. We can't precompute this as any tiles can be used in any tilemap, so we plot it on the fly */ if ((sshangha_video_control&4)==0) { sshangha_tilemap_draw(bitmap, cliprect); - draw_sprites(machine, bitmap, cliprect, spriteram16,0x4000,0x4000); + draw_sprites(screen->machine, bitmap, cliprect, spriteram16,0x4000,0x4000); } else { tilemap_draw(bitmap,cliprect,pf2_tilemap,0,0); - draw_sprites(machine, bitmap, cliprect, spriteram16,0x4000,0x4000); + draw_sprites(screen->machine, bitmap, cliprect, spriteram16,0x4000,0x4000); if (sshangha_control_0[6]&0x80) tilemap_draw(bitmap,cliprect,pf1_8x8_tilemap,0,0); @@ -253,7 +253,7 @@ VIDEO_UPDATE( sshangha ) tilemap_draw(bitmap,cliprect,pf1_16x16_tilemap,0,0); } - draw_sprites(machine, bitmap, cliprect, spriteram16_2,0x0000,0x0000); - draw_sprites(machine, bitmap, cliprect, spriteram16,0x4000,0x0000); + draw_sprites(screen->machine, bitmap, cliprect, spriteram16_2,0x0000,0x0000); + draw_sprites(screen->machine, bitmap, cliprect, spriteram16,0x4000,0x0000); return 0; } diff --git a/src/mame/video/sslam.c b/src/mame/video/sslam.c index d4abe79a092..d65dbf95968 100644 --- a/src/mame/video/sslam.c +++ b/src/mame/video/sslam.c @@ -165,7 +165,7 @@ VIDEO_UPDATE(sslam) { if(!(sslam_regs[6] & 1)) { - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); return 0; } @@ -194,7 +194,7 @@ VIDEO_UPDATE(sslam) tilemap_draw(bitmap,cliprect,sslam_md_tilemap,0,0); } - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,sslam_tx_tilemap,0,0); return 0; } @@ -203,7 +203,7 @@ VIDEO_UPDATE(powerbls) { if(!(sslam_regs[6] & 1)) { - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); return 0; } @@ -211,6 +211,6 @@ VIDEO_UPDATE(powerbls) tilemap_set_scrolly(sslam_bg_tilemap,0, sslam_regs[1]-240); tilemap_draw(bitmap,cliprect,sslam_bg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/ssozumo.c b/src/mame/video/ssozumo.c index b0235336cb1..adfbfff4b20 100644 --- a/src/mame/video/ssozumo.c +++ b/src/mame/video/ssozumo.c @@ -177,6 +177,6 @@ VIDEO_UPDATE( ssozumo ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/sspeedr.c b/src/mame/video/sspeedr.c index 0dac27b15ee..07e42268896 100644 --- a/src/mame/video/sspeedr.c +++ b/src/mame/video/sspeedr.c @@ -260,10 +260,8 @@ VIDEO_START( sspeedr ) VIDEO_UPDATE( sspeedr ) { draw_track(bitmap); - - draw_drones(machine, bitmap, cliprect); - - draw_driver(machine, bitmap, cliprect); + draw_drones(screen->machine, bitmap, cliprect); + draw_driver(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/ssrj.c b/src/mame/video/ssrj.c index 93999e7d994..494066c8235 100644 --- a/src/mame/video/ssrj.c +++ b/src/mame/video/ssrj.c @@ -282,7 +282,7 @@ VIDEO_UPDATE( ssrj ) tilemap_set_scrolly(tilemap1 , 0, 0xff-ssrj_scrollram[2] ); tilemap_set_scrollx(tilemap1 , 0, ssrj_scrollram[0] ); tilemap_draw(bitmap,cliprect,tilemap1, 0,0); - draw_objects(machine, bitmap,cliprect); + draw_objects(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,tilemap2, 0,0); if(ssrj_scrollram[0x101]==0xb)tilemap_draw(bitmap,cliprect,tilemap4, 0,0);/* hack to display 4th tilemap */ diff --git a/src/mame/video/ssv.c b/src/mame/video/ssv.c index 42fa1c4020c..4e868284cdb 100644 --- a/src/mame/video/ssv.c +++ b/src/mame/video/ssv.c @@ -931,8 +931,8 @@ VIDEO_UPDATE( eaglshot ) { eaglshot_dirty_tile[tile] = 0; - decodechar(machine->gfx[0], tile, (UINT8 *)eaglshot_gfxram); - decodechar(machine->gfx[1], tile, (UINT8 *)eaglshot_gfxram); + decodechar(screen->machine->gfx[0], tile, (UINT8 *)eaglshot_gfxram); + decodechar(screen->machine->gfx[1], tile, (UINT8 *)eaglshot_gfxram); } } } @@ -1121,13 +1121,13 @@ VIDEO_UPDATE( gdfs ) { eaglshot_dirty_tile[tile] = 0; - decodechar(machine->gfx[2], tile, (UINT8 *)eaglshot_gfxram); + decodechar(screen->machine->gfx[2], tile, (UINT8 *)eaglshot_gfxram); } } } for (pri = 0; pri <= 0xf; pri++) - gdfs_draw_zooming_sprites(machine, bitmap, cliprect, pri); + gdfs_draw_zooming_sprites(screen->machine, bitmap, cliprect, pri); tilemap_set_scrollx(gdfs_tmap,0,gdfs_tmapscroll[0x0c/2]); tilemap_set_scrolly(gdfs_tmap,0,gdfs_tmapscroll[0x10/2]); @@ -1163,8 +1163,8 @@ VIDEO_UPDATE( ssv ) if (!enable_video) return 0; - draw_layer(machine, bitmap, cliprect, 0); // "background layer" + draw_layer(screen->machine, bitmap, cliprect, 0); // "background layer" - draw_sprites(machine, bitmap, cliprect); // sprites list + draw_sprites(screen->machine, bitmap, cliprect); // sprites list return 0; } diff --git a/src/mame/video/st0016.c b/src/mame/video/st0016.c index 08893aa7f26..52b253de646 100644 --- a/src/mame/video/st0016.c +++ b/src/mame/video/st0016.c @@ -635,7 +635,7 @@ VIDEO_UPDATE( st0016 ) //super eagle shot int x,y,dy; - fillbitmap(speglsht_bitmap,0,&machine->screen[0].visarea); + fillbitmap(speglsht_bitmap,0,&screen->machine->screen[0].visarea); dy=(speglsht_videoreg&0x20)?(256*512):0; //visible frame for(y=0;y<256;y++) @@ -648,9 +648,9 @@ VIDEO_UPDATE( st0016 ) } //draw st0016 gfx to temporary bitmap (indexed 16) - draw_bgmap(machine, speglsht_bitmap,cliprect,0); - draw_sprites(machine, speglsht_bitmap,cliprect); - draw_bgmap(machine, speglsht_bitmap,cliprect,1); + draw_bgmap(screen->machine, speglsht_bitmap,cliprect,0); + draw_sprites(screen->machine, speglsht_bitmap,cliprect); + draw_bgmap(screen->machine, speglsht_bitmap,cliprect,1); //copy temporary bitmap to rgb 32 bit bitmap for(y=cliprect->min_y; y<cliprect->max_y;y++) @@ -660,7 +660,7 @@ VIDEO_UPDATE( st0016 ) { if(srcline[x]) { - rgb_t color=palette_get_color(machine, srcline[x]); + rgb_t color=palette_get_color(screen->machine, srcline[x]); PLOT_PIXEL_RGB(x,y,RGB_RED(color),RGB_GREEN(color),RGB_BLUE(color)); } } @@ -676,10 +676,10 @@ VIDEO_UPDATE( st0016 ) } } - fillbitmap(bitmap,UNUSED_PEN,&machine->screen[0].visarea); - draw_bgmap(machine, bitmap,cliprect,0); - draw_sprites(machine, bitmap,cliprect); - draw_bgmap(machine, bitmap,cliprect,1); + fillbitmap(bitmap,UNUSED_PEN,cliprect); + draw_bgmap(screen->machine, bitmap,cliprect,0); + draw_sprites(screen->machine, bitmap,cliprect); + draw_bgmap(screen->machine, bitmap,cliprect,1); } return 0; } diff --git a/src/mame/video/stactics.c b/src/mame/video/stactics.c index cb21e364c95..0056d307614 100644 --- a/src/mame/video/stactics.c +++ b/src/mame/video/stactics.c @@ -391,7 +391,7 @@ static VIDEO_START( stactics ) static VIDEO_UPDATE( stactics ) { - stactics_state *state = machine->driver_data; + stactics_state *state = screen->machine->driver_data; update_beam(state); draw_background(state, bitmap, cliprect); diff --git a/src/mame/video/stadhero.c b/src/mame/video/stadhero.c index dbba0e36811..6c80a41188d 100644 --- a/src/mame/video/stadhero.c +++ b/src/mame/video/stadhero.c @@ -93,7 +93,7 @@ VIDEO_UPDATE( stadhero ) tilemap_set_scrolly( pf2_tilemap,0, stadhero_pf2_control_1[1] ); tilemap_draw(bitmap,cliprect,pf2_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect,0x00,0x00); + draw_sprites(screen->machine, bitmap,cliprect,0x00,0x00); tilemap_draw(bitmap,cliprect,pf1_tilemap,0,0); return 0; } diff --git a/src/mame/video/starcrus.c b/src/mame/video/starcrus.c index df46b936178..bb82666eb78 100644 --- a/src/mame/video/starcrus.c +++ b/src/mame/video/starcrus.c @@ -471,7 +471,7 @@ VIDEO_UPDATE( starcrus ) /* Draw ship 1 */ drawgfx(bitmap, - machine->gfx[8+((s1_sprite&0x04)>>2)], + screen->machine->gfx[8+((s1_sprite&0x04)>>2)], (s1_sprite&0x03)^0x03, 0, (s1_sprite&0x08)>>3,(s1_sprite&0x10)>>4, @@ -482,7 +482,7 @@ VIDEO_UPDATE( starcrus ) /* Draw ship 2 */ drawgfx(bitmap, - machine->gfx[10+((s2_sprite&0x04)>>2)], + screen->machine->gfx[10+((s2_sprite&0x04)>>2)], (s2_sprite&0x03)^0x03, 0, (s2_sprite&0x08)>>3,(s2_sprite&0x10)>>4, @@ -493,7 +493,7 @@ VIDEO_UPDATE( starcrus ) /* Draw score/projectile 1 */ drawgfx(bitmap, - machine->gfx[(p1_sprite&0x0c)>>2], + screen->machine->gfx[(p1_sprite&0x0c)>>2], (p1_sprite&0x03)^0x03, 0, 0,0, @@ -504,7 +504,7 @@ VIDEO_UPDATE( starcrus ) /* Draw score/projectile 2 */ drawgfx(bitmap, - machine->gfx[4+((p2_sprite&0x0c)>>2)], + screen->machine->gfx[4+((p2_sprite&0x0c)>>2)], (p2_sprite&0x03)^0x03, 0, 0,0, @@ -514,28 +514,28 @@ VIDEO_UPDATE( starcrus ) 0); /* Collision detection */ - if (cliprect->max_y == machine->screen[screen].visarea.max_y) + if (cliprect->max_y == screen->machine->screen[scrnum].visarea.max_y) { collision_reg = 0x00; /* Check for collisions between ship1 and ship2 */ - if (collision_check_s1s2(machine)) + if (collision_check_s1s2(screen->machine)) { collision_reg |= 0x08; } /* Check for collisions between ship1 and projectiles */ - if (collision_check_s1p1p2(machine)) + if (collision_check_s1p1p2(screen->machine)) { collision_reg |= 0x02; } /* Check for collisions between ship1 and projectiles */ - if (collision_check_s2p1p2(machine)) + if (collision_check_s2p1p2(screen->machine)) { collision_reg |= 0x01; } /* Check for collisions between ship1 and projectiles */ /* Note: I don't think this is used by the game */ - if (collision_check_p1p2(machine)) + if (collision_check_p1p2(screen->machine)) { collision_reg |= 0x04; } diff --git a/src/mame/video/starshp1.c b/src/mame/video/starshp1.c index 08ac3997fbd..f0388d366fe 100644 --- a/src/mame/video/starshp1.c +++ b/src/mame/video/starshp1.c @@ -377,20 +377,20 @@ static int circle_collision(rectangle *rect) VIDEO_UPDATE( starshp1 ) { - set_pens(machine->colortable); + set_pens(screen->machine->colortable); fillbitmap(bitmap, 0, cliprect); if (starshp1_starfield_kill == 0) draw_starfield(bitmap); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); if (starshp1_circle_kill == 0 && starshp1_circle_mod != 0) draw_circle(bitmap); if (starshp1_attract == 0) - draw_spaceship(machine, bitmap, cliprect); + draw_spaceship(screen->machine, bitmap, cliprect); if (starshp1_circle_kill == 0 && starshp1_circle_mod == 0) draw_circle(bitmap); diff --git a/src/mame/video/stfight.c b/src/mame/video/stfight.c index d6fa173c1e9..44e512223ae 100644 --- a/src/mame/video/stfight.c +++ b/src/mame/video/stfight.c @@ -294,7 +294,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( stfight ) { - set_pens(machine->colortable); + set_pens(screen->machine->colortable); fillbitmap(priority_bitmap,0,cliprect); @@ -304,7 +304,7 @@ VIDEO_UPDATE( stfight ) /* Draw sprites (may be obscured by foreground layer) */ if (stfight_vh_latch_ram[0x07] & 0x40) - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); return 0; diff --git a/src/mame/video/stlforce.c b/src/mame/video/stlforce.c index fe6fb5e1418..2ec0f3ebb18 100644 --- a/src/mame/video/stlforce.c +++ b/src/mame/video/stlforce.c @@ -174,7 +174,7 @@ VIDEO_UPDATE( stlforce ) tilemap_draw(bitmap,cliprect,stlforce_bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,stlforce_mlow_tilemap,0,0); tilemap_draw(bitmap,cliprect,stlforce_mhigh_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,stlforce_tx_tilemap,0,0); return 0; } diff --git a/src/mame/video/strnskil.c b/src/mame/video/strnskil.c index de9f4f1e1e9..70a5d1bee60 100644 --- a/src/mame/video/strnskil.c +++ b/src/mame/video/strnskil.c @@ -142,6 +142,6 @@ VIDEO_UPDATE( strnskil ) } tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/stvvdp2.c b/src/mame/video/stvvdp2.c index eccfd68cdce..f5219da4f48 100644 --- a/src/mame/video/stvvdp2.c +++ b/src/mame/video/stvvdp2.c @@ -6074,11 +6074,11 @@ VIDEO_UPDATE( stv_vdp2 ) stv_vdp2_dynamic_res_change(); - video_update_vdp1(machine); + video_update_vdp1(screen->machine); - stv_vdp2_fade_effects(machine); + stv_vdp2_fade_effects(screen->machine); - stv_vdp2_draw_back(machine, bitmap,cliprect); + stv_vdp2_draw_back(screen->machine, bitmap,cliprect); #ifdef MAME_DEBUG if(input_code_pressed_once(KEYCODE_T)) @@ -6122,12 +6122,12 @@ VIDEO_UPDATE( stv_vdp2 ) /*If a plane has a priority value of zero it isn't shown at all.*/ for(pri=1;pri<8;pri++) { - if (debug.l_en & 1) {if(pri==STV_VDP2_N3PRIN) stv_vdp2_draw_NBG3(machine, bitmap,cliprect);} - if (debug.l_en & 2) {if(pri==STV_VDP2_N2PRIN) stv_vdp2_draw_NBG2(machine, bitmap,cliprect);} - if (debug.l_en & 4) {if(pri==STV_VDP2_N1PRIN) stv_vdp2_draw_NBG1(machine, bitmap,cliprect);} - if (debug.l_en & 8) {if(pri==STV_VDP2_N0PRIN) stv_vdp2_draw_NBG0(machine, bitmap,cliprect);} - if (debug.l_en & 0x10) {if(pri==STV_VDP2_R0PRIN) stv_vdp2_draw_RBG0(machine, bitmap,cliprect);} - if (debug.l_en & 0x20) {draw_sprites(machine,bitmap,cliprect,pri);} + if (debug.l_en & 1) {if(pri==STV_VDP2_N3PRIN) stv_vdp2_draw_NBG3(screen->machine, bitmap,cliprect);} + if (debug.l_en & 2) {if(pri==STV_VDP2_N2PRIN) stv_vdp2_draw_NBG2(screen->machine, bitmap,cliprect);} + if (debug.l_en & 4) {if(pri==STV_VDP2_N1PRIN) stv_vdp2_draw_NBG1(screen->machine, bitmap,cliprect);} + if (debug.l_en & 8) {if(pri==STV_VDP2_N0PRIN) stv_vdp2_draw_NBG0(screen->machine, bitmap,cliprect);} + if (debug.l_en & 0x10) {if(pri==STV_VDP2_R0PRIN) stv_vdp2_draw_RBG0(screen->machine, bitmap,cliprect);} + if (debug.l_en & 0x20) {draw_sprites(screen->machine,bitmap,cliprect,pri);} } } @@ -6155,41 +6155,41 @@ VIDEO_UPDATE( stv_vdp2 ) for (tilecode = 0;tilecode<0x8000;tilecode++) { - decodechar(machine->gfx[0], tilecode, stv_vdp2_gfx_decode); + decodechar(screen->machine->gfx[0], tilecode, stv_vdp2_gfx_decode); } for (tilecode = 0;tilecode<0x2000;tilecode++) { - decodechar(machine->gfx[1], tilecode, stv_vdp2_gfx_decode); + decodechar(screen->machine->gfx[1], tilecode, stv_vdp2_gfx_decode); } for (tilecode = 0;tilecode<0x4000;tilecode++) { - decodechar(machine->gfx[2], tilecode, stv_vdp2_gfx_decode); + decodechar(screen->machine->gfx[2], tilecode, stv_vdp2_gfx_decode); } for (tilecode = 0;tilecode<0x1000;tilecode++) { - decodechar(machine->gfx[3], tilecode, stv_vdp2_gfx_decode); + decodechar(screen->machine->gfx[3], tilecode, stv_vdp2_gfx_decode); } /* vdp 1 ... doesn't have to be tile based */ for (tilecode = 0;tilecode<0x8000;tilecode++) { - decodechar(machine->gfx[4], tilecode, stv_vdp1_gfx_decode); + decodechar(screen->machine->gfx[4], tilecode, stv_vdp1_gfx_decode); } for (tilecode = 0;tilecode<0x2000;tilecode++) { - decodechar(machine->gfx[5], tilecode, stv_vdp1_gfx_decode); + decodechar(screen->machine->gfx[5], tilecode, stv_vdp1_gfx_decode); } for (tilecode = 0;tilecode<0x4000;tilecode++) { - decodechar(machine->gfx[6], tilecode, stv_vdp1_gfx_decode); + decodechar(screen->machine->gfx[6], tilecode, stv_vdp1_gfx_decode); } for (tilecode = 0;tilecode<0x1000;tilecode++) { - decodechar(machine->gfx[7], tilecode, stv_vdp1_gfx_decode); + decodechar(screen->machine->gfx[7], tilecode, stv_vdp1_gfx_decode); } } diff --git a/src/mame/video/subs.c b/src/mame/video/subs.c index 2ca968a4bcd..618aa6889d9 100644 --- a/src/mame/video/subs.c +++ b/src/mame/video/subs.c @@ -72,18 +72,18 @@ VIDEO_UPDATE( subs ) charcode = charcode & 0x3F; /* Draw the left screen */ - if (screen==0) + if (scrnum==0) { if ((left_enable || left_sonar_window) && (!right_sonar_window)) { - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], charcode, 1, 0,0,sx,sy, cliprect,TRANSPARENCY_NONE,0); } else { - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], 0, 1, 0,0,sx,sy, cliprect,TRANSPARENCY_NONE,0); @@ -91,18 +91,18 @@ VIDEO_UPDATE( subs ) } /* Draw the right screen */ - if (screen==1) + if (scrnum==1) { if ((right_enable || right_sonar_window) && (!left_sonar_window)) { - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], charcode, 0, 0,0,sx,sy, cliprect,TRANSPARENCY_NONE,0); } else { - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], 0, 0, 0,0,sx,sy, cliprect,TRANSPARENCY_NONE,0); @@ -130,11 +130,11 @@ VIDEO_UPDATE( subs ) charcode = (charcode >> 3) & 0x1F; /* Left screen - special check for drawing right screen's sub */ - if (screen==0) + if (scrnum==0) { if ((offs!=0) || (sub_enable)) { - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], charcode + 32 * prom_set, 0, 0,0,sx,sy, @@ -144,11 +144,11 @@ VIDEO_UPDATE( subs ) /* Right screen - special check for drawing left screen's sub */ - if (screen==1) + if (scrnum==1) { if ((offs!=1) || (sub_enable)) { - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], charcode + 32 * prom_set, 0, 0,0,sx,sy, @@ -158,7 +158,7 @@ VIDEO_UPDATE( subs ) } /* Update sound */ - discrete_sound_w(machine, SUBS_LAUNCH_DATA, spriteram[5] & 0x0f); // Launch data - discrete_sound_w(machine, SUBS_CRASH_DATA, spriteram[5] >> 4); // Crash/explode data + discrete_sound_w(screen->machine, SUBS_LAUNCH_DATA, spriteram[5] & 0x0f); // Launch data + discrete_sound_w(screen->machine, SUBS_CRASH_DATA, spriteram[5] >> 4); // Crash/explode data return 0; } diff --git a/src/mame/video/suna16.c b/src/mame/video/suna16.c index d473d17c6ad..0a457791764 100644 --- a/src/mame/video/suna16.c +++ b/src/mame/video/suna16.c @@ -221,7 +221,7 @@ VIDEO_UPDATE( suna16 ) { /* Suna Quiz indicates the background is the last pen */ fillbitmap(bitmap,0xff,cliprect); - draw_sprites(machine, bitmap, cliprect, spriteram16, 0); + draw_sprites(screen->machine, bitmap, cliprect, spriteram16, 0); return 0; } @@ -240,7 +240,7 @@ if (input_code_pressed(KEYCODE_Z)) /* Suna Quiz indicates the background is the last pen */ fillbitmap(bitmap,0xff,cliprect); - if (layers_ctrl & 1) draw_sprites(machine, bitmap, cliprect, spriteram16, 0); - if (layers_ctrl & 2) draw_sprites(machine, bitmap, cliprect, spriteram16_2, 1); + if (layers_ctrl & 1) draw_sprites(screen->machine, bitmap, cliprect, spriteram16, 0); + if (layers_ctrl & 2) draw_sprites(screen->machine, bitmap, cliprect, spriteram16_2, 1); return 0; } diff --git a/src/mame/video/suna8.c b/src/mame/video/suna8.c index e0b5e581d61..21390c4f35f 100644 --- a/src/mame/video/suna8.c +++ b/src/mame/video/suna8.c @@ -443,8 +443,8 @@ VIDEO_UPDATE( suna8 ) #endif #endif { - draw_normal_sprites(machine ,bitmap,cliprect); - draw_text_sprites(machine, bitmap,cliprect); + draw_normal_sprites(screen->machine ,bitmap,cliprect); + draw_text_sprites(screen->machine, bitmap,cliprect); } return 0; } diff --git a/src/mame/video/supbtime.c b/src/mame/video/supbtime.c index 2d873fa8b5e..85d12eb00fd 100644 --- a/src/mame/video/supbtime.c +++ b/src/mame/video/supbtime.c @@ -96,7 +96,7 @@ VIDEO_UPDATE(supbtime) fillbitmap(bitmap,768,cliprect); deco16_tilemap_2_draw(bitmap,cliprect,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); deco16_tilemap_1_draw(bitmap,cliprect,0,0); return 0; } diff --git a/src/mame/video/superchs.c b/src/mame/video/superchs.c index 78a34699a81..004afb0ba41 100644 --- a/src/mame/video/superchs.c +++ b/src/mame/video/superchs.c @@ -218,7 +218,7 @@ VIDEO_UPDATE( superchs ) UINT16 priority; static const int primasks[4] = {0xfffc, 0xfff0, 0xff00, 0x0}; - TC0480SCP_tilemap_update(machine); + TC0480SCP_tilemap_update(screen->machine); priority = TC0480SCP_get_bg_priority(); layer[0] = (priority &0xf000) >> 12; /* tells us which bg layer is bottom */ @@ -238,14 +238,14 @@ VIDEO_UPDATE( superchs ) if (!input_code_pressed (KEYCODE_C)) TC0480SCP_tilemap_draw(bitmap,cliprect,layer[2],0,2); if (!input_code_pressed (KEYCODE_V)) TC0480SCP_tilemap_draw(bitmap,cliprect,layer[3],0,4); if (!input_code_pressed (KEYCODE_B)) TC0480SCP_tilemap_draw(bitmap,cliprect,layer[4],0,8); - if (!input_code_pressed (KEYCODE_N)) draw_sprites(machine,bitmap,cliprect,primasks,48,-116); + if (!input_code_pressed (KEYCODE_N)) draw_sprites(screen->machine,bitmap,cliprect,primasks,48,-116); #else TC0480SCP_tilemap_draw(bitmap,cliprect,layer[0],TILEMAP_DRAW_OPAQUE,0); TC0480SCP_tilemap_draw(bitmap,cliprect,layer[1],0,1); TC0480SCP_tilemap_draw(bitmap,cliprect,layer[2],0,2); TC0480SCP_tilemap_draw(bitmap,cliprect,layer[3],0,4); TC0480SCP_tilemap_draw(bitmap,cliprect,layer[4],0,8); /* text layer */ - draw_sprites(machine, bitmap,cliprect,primasks,48,-116); + draw_sprites(screen->machine, bitmap,cliprect,primasks,48,-116); #endif return 0; } diff --git a/src/mame/video/superqix.c b/src/mame/video/superqix.c index b8dc23c701d..501af229a77 100644 --- a/src/mame/video/superqix.c +++ b/src/mame/video/superqix.c @@ -226,7 +226,7 @@ static void superqix_draw_sprites(running_machine *machine, bitmap_t *bitmap,con VIDEO_UPDATE( pbillian ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - pbillian_draw_sprites(machine, bitmap,cliprect); + pbillian_draw_sprites(screen->machine, bitmap,cliprect); if (pbillian_show_power) { @@ -254,7 +254,7 @@ VIDEO_UPDATE( superqix ) { tilemap_draw(bitmap, cliprect, bg_tilemap, TILEMAP_DRAW_LAYER1, 0); copybitmap_trans(bitmap,fg_bitmap[show_bitmap],flip_screen_get(),flip_screen_get(),0,0,cliprect,0); - superqix_draw_sprites(machine, bitmap,cliprect); + superqix_draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap, cliprect, bg_tilemap, TILEMAP_DRAW_LAYER0, 0); return 0; } diff --git a/src/mame/video/suprnova.c b/src/mame/video/suprnova.c index c6c8b0887f1..31a611df641 100644 --- a/src/mame/video/suprnova.c +++ b/src/mame/video/suprnova.c @@ -877,7 +877,7 @@ VIDEO_UPDATE(skns) UINT8 *btiles; - palette_update(machine); + palette_update(screen->machine); btiles = memory_region (REGION_GFX3); @@ -899,7 +899,7 @@ VIDEO_UPDATE(skns) { if (skns_v3t_dirty[i] == 1) { - decodechar(machine->gfx[1], i, (UINT8*)btiles); + decodechar(screen->machine->gfx[1], i, (UINT8*)btiles); skns_v3t_dirty[i] = 0; } @@ -925,7 +925,7 @@ VIDEO_UPDATE(skns) { if (skns_v3t_4bppdirty[i] == 1) { - decodechar(machine->gfx[3], i, (UINT8*)btiles); + decodechar(screen->machine->gfx[3], i, (UINT8*)btiles); skns_v3t_4bppdirty[i] = 0; } @@ -933,7 +933,7 @@ VIDEO_UPDATE(skns) } } - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); { int supernova_pri_a; @@ -945,10 +945,10 @@ VIDEO_UPDATE(skns) /* needed until we have the per tile priorities sorted out */ - if (!strcmp(machine->gamedrv->name,"vblokbrk") || - !strcmp(machine->gamedrv->name,"sarukani") || - !strcmp(machine->gamedrv->name,"sengekis") || - !strcmp(machine->gamedrv->name,"sengekij")) + if (!strcmp(screen->machine->gamedrv->name,"vblokbrk") || + !strcmp(screen->machine->gamedrv->name,"sarukani") || + !strcmp(screen->machine->gamedrv->name,"sengekis") || + !strcmp(screen->machine->gamedrv->name,"sengekij")) { supernova_pri_b = 0; supernova_pri_a = 1; @@ -964,7 +964,7 @@ VIDEO_UPDATE(skns) } - skns_draw_sprites(machine, bitmap, cliprect); + skns_draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/suprridr.c b/src/mame/video/suprridr.c index 37da76123a8..8f78d6de4d2 100644 --- a/src/mame/video/suprridr.c +++ b/src/mame/video/suprridr.c @@ -171,19 +171,19 @@ VIDEO_UPDATE( suprridr ) int i; /* render left 4 columns with no scroll */ - subclip = machine->screen[0].visarea; + subclip = screen->machine->screen[0].visarea; subclip.max_x = subclip.min_x + (flipx ? 1*8 : 4*8) - 1; sect_rect(&subclip, cliprect); tilemap_draw(bitmap, &subclip, bg_tilemap_noscroll, 0, 0); /* render right 1 column with no scroll */ - subclip = machine->screen[0].visarea; + subclip = screen->machine->screen[0].visarea; subclip.min_x = subclip.max_x - (flipx ? 4*8 : 1*8) + 1; sect_rect(&subclip, cliprect); tilemap_draw(bitmap, &subclip, bg_tilemap_noscroll, 0, 0); /* render the middle columns normally */ - subclip = machine->screen[0].visarea; + subclip = screen->machine->screen[0].visarea; subclip.min_x += flipx ? 1*8 : 4*8; subclip.max_x -= flipx ? 4*8 : 1*8; sect_rect(&subclip, cliprect); @@ -212,7 +212,7 @@ VIDEO_UPDATE( suprridr ) fy = !fy; y = 240 - y; } - drawgfx(bitmap, machine->gfx[2], code, color, fx, fy, x, y, cliprect, TRANSPARENCY_PEN, 0); + drawgfx(bitmap, screen->machine->gfx[2], code, color, fx, fy, x, y, cliprect, TRANSPARENCY_PEN, 0); } return 0; } diff --git a/src/mame/video/suprslam.c b/src/mame/video/suprslam.c index d5e8875dc75..3c65ae63eb8 100644 --- a/src/mame/video/suprslam.c +++ b/src/mame/video/suprslam.c @@ -150,12 +150,9 @@ VIDEO_START( suprslam ) VIDEO_UPDATE( suprslam ) { - fillbitmap(bitmap,get_black_pen(machine),cliprect); - + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); K053936_0_zoom_draw(bitmap,cliprect,suprslam_bg_tilemap,0,0); - - draw_sprites(machine, bitmap, cliprect); - + draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap,cliprect,suprslam_screen_tilemap,0,0); return 0; } diff --git a/src/mame/video/system1.c b/src/mame/video/system1.c index 530257a6531..14eebc8f175 100644 --- a/src/mame/video/system1.c +++ b/src/mame/video/system1.c @@ -527,13 +527,13 @@ VIDEO_UPDATE( system1 ) int drawn; - system1_draw_bg(machine, bitmap, cliprect, -1); - drawn = system1_draw_fg(machine, bitmap, cliprect, 0); + system1_draw_bg(screen->machine, bitmap, cliprect, -1); + drawn = system1_draw_fg(screen->machine, bitmap, cliprect, 0); /* redraw low priority bg tiles if necessary */ - if (drawn) system1_draw_bg(machine, bitmap, cliprect, 0); + if (drawn) system1_draw_bg(screen->machine, bitmap, cliprect, 0); draw_sprites(bitmap); - system1_draw_bg(machine, bitmap, cliprect, 1); - system1_draw_fg(machine, bitmap, cliprect, 1); + system1_draw_bg(screen->machine, bitmap, cliprect, 1); + system1_draw_fg(screen->machine, bitmap, cliprect, 1); /* even if screen is off, sprites must still be drawn to update the collision table */ if (system1_video_mode & 0x10) /* screen off */ @@ -668,13 +668,13 @@ VIDEO_UPDATE( choplifter ) int drawn; - chplft_draw_bg(machine, bitmap, cliprect, -1); - drawn = system1_draw_fg(machine, bitmap, cliprect, 0); + chplft_draw_bg(screen->machine, bitmap, cliprect, -1); + drawn = system1_draw_fg(screen->machine, bitmap, cliprect, 0); /* redraw low priority bg tiles if necessary */ - if (drawn) chplft_draw_bg(machine, bitmap, cliprect, 0); + if (drawn) chplft_draw_bg(screen->machine, bitmap, cliprect, 0); draw_sprites(bitmap); - chplft_draw_bg(machine, bitmap, cliprect, 1); - system1_draw_fg(machine, bitmap, cliprect, 1); + chplft_draw_bg(screen->machine, bitmap, cliprect, 1); + system1_draw_fg(screen->machine, bitmap, cliprect, 1); /* even if screen is off, sprites must still be drawn to update the collision table */ if (system1_video_mode & 0x10) /* screen off */ @@ -802,10 +802,10 @@ static void wbml_draw_fg(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( wbml ) { - wbml_draw_bg(machine, bitmap, cliprect, 0); + wbml_draw_bg(screen->machine, bitmap, cliprect, 0); draw_sprites(bitmap); - wbml_draw_bg(machine, bitmap, cliprect, 1); - wbml_draw_fg(machine, bitmap, cliprect); + wbml_draw_bg(screen->machine, bitmap, cliprect, 1); + wbml_draw_fg(screen->machine, bitmap, cliprect); /* even if screen is off, sprites must still be drawn to update the collision table */ if (system1_video_mode & 0x10) /* screen off */ @@ -872,10 +872,10 @@ static void ufosensi_draw_bg(running_machine *machine, bitmap_t *bitmap, const r VIDEO_UPDATE( ufosensi ) { - ufosensi_draw_bg(machine, bitmap, cliprect, 0); + ufosensi_draw_bg(screen->machine, bitmap, cliprect, 0); draw_sprites(bitmap); - ufosensi_draw_bg(machine, bitmap, cliprect, 1); - wbml_draw_fg(machine, bitmap, cliprect); + ufosensi_draw_bg(screen->machine, bitmap, cliprect, 1); + wbml_draw_fg(screen->machine, bitmap, cliprect); /* even if screen is off, sprites must still be drawn to update the collision table */ if (system1_video_mode & 0x10) /* screen off */ @@ -890,13 +890,13 @@ VIDEO_UPDATE( blockgal ) blockgal_kludgeoffset = -8; - system1_draw_bg(machine, bitmap, cliprect, -1); - drawn = system1_draw_fg(machine, bitmap, cliprect, 0); + system1_draw_bg(screen->machine, bitmap, cliprect, -1); + drawn = system1_draw_fg(screen->machine, bitmap, cliprect, 0); /* redraw low priority bg tiles if necessary */ - if (drawn) system1_draw_bg(machine, bitmap, cliprect, 0); + if (drawn) system1_draw_bg(screen->machine, bitmap, cliprect, 0); draw_sprites(bitmap); - system1_draw_bg(machine, bitmap, cliprect, 1); - system1_draw_fg(machine, bitmap, cliprect, 1); + system1_draw_bg(screen->machine, bitmap, cliprect, 1); + system1_draw_fg(screen->machine, bitmap, cliprect, 1); /* even if screen is off, sprites must still be drawn to update the collision table */ if (system1_video_mode & 0x10) /* screen off */ diff --git a/src/mame/video/system16.c b/src/mame/video/system16.c index 52518612926..b1284d37715 100644 --- a/src/mame/video/system16.c +++ b/src/mame/video/system16.c @@ -1091,7 +1091,7 @@ VIDEO_UPDATE( system16 ){ // sprite_draw(sprite_list,0); tilemap_draw( bitmap,cliprect, text_layer, 0, 0xf ); - draw_sprites(machine, bitmap,cliprect,0 ); + draw_sprites(screen->machine, bitmap,cliprect,0 ); return 0; } @@ -1100,7 +1100,7 @@ VIDEO_UPDATE( system18old ){ if (!sys16_refreshenable) { /* should it REALLY not clear the bitmap? ddcrew vdp gfx look ugly if i don't do it like this */ - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); return 0; } @@ -1118,7 +1118,7 @@ VIDEO_UPDATE( system18old ){ tilemap_draw( bitmap,cliprect, background, TILEMAP_DRAW_OPAQUE | 1, 0 ); //?? tilemap_draw( bitmap,cliprect, background, TILEMAP_DRAW_OPAQUE | 2, 0 ); //?? - if (!strcmp(machine->gamedrv->name,"astorm")) update_system18_vdp(bitmap,cliprect); // kludge: render vdp here for astorm + if (!strcmp(screen->machine->gamedrv->name,"astorm")) update_system18_vdp(bitmap,cliprect); // kludge: render vdp here for astorm /* ASTORM also draws some sprites with the vdp, needs to be higher priority..*/ // sprite_draw(sprite_list,3); @@ -1133,16 +1133,16 @@ VIDEO_UPDATE( system18old ){ if(sys18_fg2_active) tilemap_draw( bitmap,cliprect, foreground2, 1, 0x7 ); tilemap_draw( bitmap,cliprect, foreground, 1, 0x7 ); - if (!strcmp(machine->gamedrv->name,"ddcrew")) update_system18_vdp(bitmap,cliprect); // kludge: render vdp here for ddcrew + if (!strcmp(screen->machine->gamedrv->name,"ddcrew")) update_system18_vdp(bitmap,cliprect); // kludge: render vdp here for ddcrew tilemap_draw( bitmap,cliprect, text_layer, 1, 0x7 ); // sprite_draw(sprite_list,0); tilemap_draw( bitmap,cliprect, text_layer, 0, 0xf ); - if (!strcmp(machine->gamedrv->name,"cltchitr")) update_system18_vdp(bitmap,cliprect); // kludge: render vdp here for clthitr, draws the ball in game! - if (!strcmp(machine->gamedrv->name,"cltchtrj")) update_system18_vdp(bitmap,cliprect); // kludge: render vdp here for clthitr, draws the ball in game! -// if (!strcmp(machine->gamedrv->name,"astorm")) update_system18_vdp(bitmap,cliprect); // kludge: render vdp here for astorm + if (!strcmp(screen->machine->gamedrv->name,"cltchitr")) update_system18_vdp(bitmap,cliprect); // kludge: render vdp here for clthitr, draws the ball in game! + if (!strcmp(screen->machine->gamedrv->name,"cltchtrj")) update_system18_vdp(bitmap,cliprect); // kludge: render vdp here for clthitr, draws the ball in game! +// if (!strcmp(screen->machine->gamedrv->name,"astorm")) update_system18_vdp(bitmap,cliprect); // kludge: render vdp here for astorm - draw_sprites(machine, bitmap,cliprect, 0 ); + draw_sprites(screen->machine, bitmap,cliprect, 0 ); return 0; } diff --git a/src/mame/video/tagteam.c b/src/mame/video/tagteam.c index 96b5fd987b1..f971023d795 100644 --- a/src/mame/video/tagteam.c +++ b/src/mame/video/tagteam.c @@ -182,6 +182,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( tagteam ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/tail2nos.c b/src/mame/video/tail2nos.c index ae38f97821b..41fb6e392cd 100644 --- a/src/mame/video/tail2nos.c +++ b/src/mame/video/tail2nos.c @@ -175,7 +175,7 @@ VIDEO_UPDATE( tail2nos ) if (dirtychar[i]) { dirtychar[i] = 0; - decodechar(machine->gfx[2],i,(UINT8 *)zoomdata); + decodechar(screen->machine->gfx[2],i,(UINT8 *)zoomdata); } } @@ -186,7 +186,7 @@ VIDEO_UPDATE( tail2nos ) if (video_enable) { K051316_zoom_draw_0(bitmap,cliprect,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); } else diff --git a/src/mame/video/taito_f2.c b/src/mame/video/taito_f2.c index 9f7f0ff14f5..1a9901c9339 100644 --- a/src/mame/video/taito_f2.c +++ b/src/mame/video/taito_f2.c @@ -1052,7 +1052,7 @@ VIDEO_UPDATE( ssi ) (they are in Majestic 12, but the tilemaps are not used anyway) */ fillbitmap(priority_bitmap,0,cliprect); fillbitmap(bitmap,0,cliprect); - draw_sprites(machine, bitmap,cliprect,NULL, 0); + draw_sprites(screen->machine, bitmap,cliprect,NULL, 0); return 0; } @@ -1061,14 +1061,14 @@ VIDEO_UPDATE( yesnoj ) { taitof2_handle_sprite_buffering(); - TC0100SCN_tilemap_update(machine); + TC0100SCN_tilemap_update(screen->machine); fillbitmap(priority_bitmap,0,cliprect); fillbitmap(bitmap,0,cliprect); /* wrong color? */ - draw_sprites(machine, bitmap,cliprect,NULL, 0); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,TC0100SCN_bottomlayer(0),0,0); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,TC0100SCN_bottomlayer(0)^1,0,0); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,2,0,0); + draw_sprites(screen->machine, bitmap,cliprect,NULL, 0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,TC0100SCN_bottomlayer(0),0,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,TC0100SCN_bottomlayer(0)^1,0,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,2,0,0); return 0; } @@ -1077,14 +1077,14 @@ VIDEO_UPDATE( taitof2 ) { taitof2_handle_sprite_buffering(); - TC0100SCN_tilemap_update(machine); + TC0100SCN_tilemap_update(screen->machine); fillbitmap(priority_bitmap,0,cliprect); fillbitmap(bitmap,0,cliprect); /* wrong color? */ - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,TC0100SCN_bottomlayer(0),0,0); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,TC0100SCN_bottomlayer(0)^1,0,0); - draw_sprites(machine, bitmap,cliprect,NULL, 0); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,2,0,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,TC0100SCN_bottomlayer(0),0,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,TC0100SCN_bottomlayer(0)^1,0,0); + draw_sprites(screen->machine, bitmap,cliprect,NULL, 0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,2,0,0); return 0; } @@ -1095,7 +1095,7 @@ VIDEO_UPDATE( taitof2_pri ) taitof2_handle_sprite_buffering(); - TC0100SCN_tilemap_update(machine); + TC0100SCN_tilemap_update(screen->machine); layer[0] = TC0100SCN_bottomlayer(0); layer[1] = layer[0]^1; @@ -1114,11 +1114,11 @@ VIDEO_UPDATE( taitof2_pri ) fillbitmap(priority_bitmap,0,cliprect); fillbitmap(bitmap,0,cliprect); /* wrong color? */ - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[0],0,1); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[1],0,2); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[2],0,4); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0],0,1); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[1],0,2); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[2],0,4); - draw_sprites(machine, bitmap,cliprect,NULL,1); + draw_sprites(screen->machine, bitmap,cliprect,NULL,1); return 0; } @@ -1150,7 +1150,7 @@ VIDEO_UPDATE( taitof2_pri_roz ) if (has_TC0430GRW()) TC0430GRW_tilemap_update(roz_base_color); - TC0100SCN_tilemap_update(machine); + TC0100SCN_tilemap_update(screen->machine); rozpri = (TC0360PRI_regs[1] & 0xc0) >> 6; rozpri = (TC0360PRI_regs[8 + rozpri/2] >> 4*(rozpri & 1)) & 0x0f; @@ -1187,14 +1187,14 @@ VIDEO_UPDATE( taitof2_pri_roz ) { if (tilepri[layer[j]]==i) { - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[j],0,1<<drawn); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[j],0,1<<drawn); f2_tilepri[drawn]=i; drawn++; } } } - draw_sprites(machine, bitmap,cliprect,NULL,1); + draw_sprites(screen->machine, bitmap,cliprect,NULL,1); return 0; } @@ -1211,7 +1211,7 @@ VIDEO_UPDATE( thundfox ) taitof2_handle_sprite_buffering(); - TC0100SCN_tilemap_update(machine); + TC0100SCN_tilemap_update(screen->machine); layer[0][0] = TC0100SCN_bottomlayer(0); layer[0][1] = layer[0][0]^1; @@ -1252,17 +1252,17 @@ VIDEO_UPDATE( thundfox ) pick = 0; else pick = 1; - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,pick,layer[pick][drawn[pick]],0,1<<(drawn[pick]+2*pick)); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,pick,layer[pick][drawn[pick]],0,1<<(drawn[pick]+2*pick)); drawn[pick]++; } while (drawn[0] < 2) { - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[0][drawn[0]],0,1<<drawn[0]); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0][drawn[0]],0,1<<drawn[0]); drawn[0]++; } while (drawn[1] < 2) { - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,1,layer[1][drawn[1]],0,1<<(drawn[1]+2)); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,1,layer[1][drawn[1]],0,1<<(drawn[1]+2)); drawn[1]++; } @@ -1278,7 +1278,7 @@ VIDEO_UPDATE( thundfox ) if (spritepri[i] < tilepri[1][1]) primasks[i] |= 0xff00; } - draw_sprites(machine, bitmap,cliprect,primasks,0); + draw_sprites(screen->machine, bitmap,cliprect,primasks,0); } @@ -1290,13 +1290,13 @@ VIDEO_UPDATE( thundfox ) if (tilepri[0][2] < tilepri[1][2]) { - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[0][2],0,0); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,1,layer[1][2],0,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0][2],0,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,1,layer[1][2],0,0); } else { - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,1,layer[1][2],0,0); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[0][2],0,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,1,layer[1][2],0,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0][2],0,0); } return 0; } @@ -1338,7 +1338,7 @@ VIDEO_UPDATE( metalb ) taitof2_handle_sprite_buffering(); - TC0480SCP_tilemap_update(machine); + TC0480SCP_tilemap_update(screen->machine); priority = TC0480SCP_get_bg_priority(); @@ -1375,7 +1375,7 @@ VIDEO_UPDATE( metalb ) TC0480SCP_tilemap_draw(bitmap,cliprect,layer[3],0,8); TC0480SCP_tilemap_draw(bitmap,cliprect,layer[4],0,16); - draw_sprites(machine, bitmap,cliprect,NULL,1); + draw_sprites(screen->machine, bitmap,cliprect,NULL,1); return 0; } @@ -1390,7 +1390,7 @@ VIDEO_UPDATE( deadconx ) taitof2_handle_sprite_buffering(); - TC0480SCP_tilemap_update(machine); + TC0480SCP_tilemap_update(screen->machine); priority = TC0480SCP_get_bg_priority(); @@ -1433,7 +1433,7 @@ VIDEO_UPDATE( deadconx ) if (spritepri[i] < tilepri[(layer[3])]) primasks[i] |= 0xff00; } - draw_sprites(machine, bitmap,cliprect,primasks,0); + draw_sprites(screen->machine, bitmap,cliprect,primasks,0); } /* diff --git a/src/mame/video/taito_f3.c b/src/mame/video/taito_f3.c index 8de4ccc7d4f..26bc0c17d25 100644 --- a/src/mame/video/taito_f3.c +++ b/src/mame/video/taito_f3.c @@ -3247,7 +3247,7 @@ VIDEO_UPDATE( f3 ) if (vram_changed) for (tile = 0;tile < 256;tile++) if (vram_dirty[tile]) { - decodechar(machine->gfx[0],tile,(UINT8 *)f3_vram); + decodechar(screen->machine->gfx[0],tile,(UINT8 *)f3_vram); tilemap_mark_all_tiles_dirty(vram_layer); // TODO //tilemap_mark_tile_dirty(vram_layer,tile); vram_dirty[tile]=0; @@ -3257,7 +3257,7 @@ VIDEO_UPDATE( f3 ) if (pivot_changed) for (tile = 0;tile < 2048;tile++) if (pivot_dirty[tile]) { - decodechar(machine->gfx[3],tile,(UINT8 *)f3_pivot_ram); + decodechar(screen->machine->gfx[3],tile,(UINT8 *)f3_pivot_ram); tilemap_mark_tile_dirty(pixel_layer,tile); pivot_dirty[tile]=0; } @@ -3298,23 +3298,23 @@ VIDEO_UPDATE( f3 ) /* sprites */ if (sprite_lag==0) - get_sprite_info(machine, spriteram32); + get_sprite_info(screen->machine, spriteram32); /* Update sprite buffer */ - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); /* Parse sprite, alpha & clipping parts of lineram */ get_spritealphaclip_info(); /* Parse playfield effects */ - get_line_ram_info(machine, pf1_tilemap,sx_fix[0],sy_fix[0],0,f3_pf_data_1); - get_line_ram_info(machine, pf2_tilemap,sx_fix[1],sy_fix[1],1,f3_pf_data_2); - get_line_ram_info(machine, pf3_tilemap,sx_fix[2],sy_fix[2],2,f3_pf_data_3); - get_line_ram_info(machine, pf4_tilemap,sx_fix[3],sy_fix[3],3,f3_pf_data_4); + get_line_ram_info(screen->machine, pf1_tilemap,sx_fix[0],sy_fix[0],0,f3_pf_data_1); + get_line_ram_info(screen->machine, pf2_tilemap,sx_fix[1],sy_fix[1],1,f3_pf_data_2); + get_line_ram_info(screen->machine, pf3_tilemap,sx_fix[2],sy_fix[2],2,f3_pf_data_3); + get_line_ram_info(screen->machine, pf4_tilemap,sx_fix[3],sy_fix[3],3,f3_pf_data_4); get_vram_info(vram_layer,pixel_layer,sx_fix[4],sy_fix[4]); /* Draw final framebuffer */ - scanline_draw(machine, bitmap,cliprect); + scanline_draw(screen->machine, bitmap,cliprect); if (VERBOSE) print_debug_info(bitmap); diff --git a/src/mame/video/taito_h.c b/src/mame/video/taito_h.c index cbfe8824c0d..9b833d7e25f 100644 --- a/src/mame/video/taito_h.c +++ b/src/mame/video/taito_h.c @@ -421,7 +421,7 @@ static void taitoh_log_vram(void) VIDEO_UPDATE( syvalion ) { - TC0080VCO_tilemap_update(machine); + TC0080VCO_tilemap_update(screen->machine); #ifdef MAME_DEBUG taitoh_log_vram(); @@ -429,17 +429,17 @@ VIDEO_UPDATE( syvalion ) fillbitmap(bitmap, 0, cliprect); - TC0080VCO_tilemap_draw(machine,bitmap,cliprect,0,TILEMAP_DRAW_OPAQUE,0); - TC0080VCO_tilemap_draw(machine,bitmap,cliprect,1,0,0); - syvalion_draw_sprites (bitmap,cliprect); - TC0080VCO_tilemap_draw(machine,bitmap,cliprect,2,0,0); + TC0080VCO_tilemap_draw(screen->machine,bitmap,cliprect,0,TILEMAP_DRAW_OPAQUE,0); + TC0080VCO_tilemap_draw(screen->machine,bitmap,cliprect,1,0,0); + syvalion_draw_sprites(bitmap,cliprect); + TC0080VCO_tilemap_draw(screen->machine,bitmap,cliprect,2,0,0); return 0; } VIDEO_UPDATE( recordbr ) { - TC0080VCO_tilemap_update(machine); + TC0080VCO_tilemap_update(screen->machine); #ifdef MAME_DEBUG taitoh_log_vram(); @@ -449,28 +449,28 @@ VIDEO_UPDATE( recordbr ) #ifdef MAME_DEBUG if ( !input_code_pressed(KEYCODE_A) ) - TC0080VCO_tilemap_draw(machine,bitmap,cliprect,0,TILEMAP_DRAW_OPAQUE,0); + TC0080VCO_tilemap_draw(screen->machine,bitmap,cliprect,0,TILEMAP_DRAW_OPAQUE,0); if ( !input_code_pressed(KEYCODE_S) ) recordbr_draw_sprites(bitmap,cliprect,0); if ( !input_code_pressed(KEYCODE_D) ) - TC0080VCO_tilemap_draw(machine,bitmap,cliprect,1,0,0); + TC0080VCO_tilemap_draw(screen->machine,bitmap,cliprect,1,0,0); if ( !input_code_pressed(KEYCODE_F) ) recordbr_draw_sprites(bitmap,cliprect,1); #else - TC0080VCO_tilemap_draw(machine,bitmap,cliprect,0,TILEMAP_DRAW_OPAQUE,0); - recordbr_draw_sprites (bitmap,cliprect,0); - TC0080VCO_tilemap_draw(machine,bitmap,cliprect,1,0,0); - recordbr_draw_sprites (bitmap,cliprect,1); + TC0080VCO_tilemap_draw(screen->machine,bitmap,cliprect,0,TILEMAP_DRAW_OPAQUE,0); + recordbr_draw_sprites(bitmap,cliprect,0); + TC0080VCO_tilemap_draw(screen->machine,bitmap,cliprect,1,0,0); + recordbr_draw_sprites(bitmap,cliprect,1); #endif - TC0080VCO_tilemap_draw(machine,bitmap,cliprect,2,0,0); + TC0080VCO_tilemap_draw(screen->machine,bitmap,cliprect,2,0,0); return 0; } VIDEO_UPDATE( dleague ) { - TC0080VCO_tilemap_update(machine); + TC0080VCO_tilemap_update(screen->machine); #ifdef MAME_DEBUG taitoh_log_vram(); @@ -480,21 +480,21 @@ VIDEO_UPDATE( dleague ) #ifdef MAME_DEBUG if ( !input_code_pressed(KEYCODE_A) ) - TC0080VCO_tilemap_draw(machine,bitmap,cliprect,0,TILEMAP_DRAW_OPAQUE,0); + TC0080VCO_tilemap_draw(screen->machine,bitmap,cliprect,0,TILEMAP_DRAW_OPAQUE,0); if ( !input_code_pressed(KEYCODE_S) ) dleague_draw_sprites(bitmap,cliprect,0); if ( !input_code_pressed(KEYCODE_D) ) - TC0080VCO_tilemap_draw(machine,bitmap,cliprect,1,0,0); + TC0080VCO_tilemap_draw(screen->machine,bitmap,cliprect,1,0,0); if ( !input_code_pressed(KEYCODE_F) ) dleague_draw_sprites(bitmap,cliprect,1); #else - TC0080VCO_tilemap_draw(machine,bitmap,cliprect,0,TILEMAP_DRAW_OPAQUE,0); - dleague_draw_sprites (bitmap,cliprect,0); - TC0080VCO_tilemap_draw(machine,bitmap,cliprect,1,0,0); - dleague_draw_sprites (bitmap,cliprect,1); + TC0080VCO_tilemap_draw(screen->machine,bitmap,cliprect,0,TILEMAP_DRAW_OPAQUE,0); + dleague_draw_sprites (bitmap,cliprect,0); + TC0080VCO_tilemap_draw(screen->machine,bitmap,cliprect,1,0,0); + dleague_draw_sprites (bitmap,cliprect,1); #endif - TC0080VCO_tilemap_draw(machine,bitmap,cliprect,2,0,0); + TC0080VCO_tilemap_draw(screen->machine,bitmap,cliprect,2,0,0); return 0; } diff --git a/src/mame/video/taito_l.c b/src/mame/video/taito_l.c index 6a41ec29e2c..4a45fa76715 100644 --- a/src/mame/video/taito_l.c +++ b/src/mame/video/taito_l.c @@ -326,12 +326,12 @@ VIDEO_UPDATE( taitol ) tilemap_draw(bitmap,cliprect,bg18_tilemap,0,0); else /* split priority */ tilemap_draw(bitmap,cliprect,bg18_tilemap,0,1); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,ch1a_tilemap,0,0); } else - fillbitmap(bitmap,machine->pens[0],cliprect); + fillbitmap(bitmap,screen->machine->pens[0],cliprect); return 0; } diff --git a/src/mame/video/taito_z.c b/src/mame/video/taito_z.c index 39cfb002e9b..0391e4cfb63 100644 --- a/src/mame/video/taito_z.c +++ b/src/mame/video/taito_z.c @@ -849,7 +849,7 @@ VIDEO_UPDATE( contcirc ) { UINT8 layer[3]; - TC0100SCN_tilemap_update(machine); + TC0100SCN_tilemap_update(screen->machine); layer[0] = TC0100SCN_bottomlayer(0); layer[1] = layer[0]^1; @@ -859,12 +859,12 @@ VIDEO_UPDATE( contcirc ) fillbitmap(bitmap, 0, cliprect); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[0],0,0); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[1],0,1); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0],0,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[1],0,1); TC0150ROD_draw(bitmap,cliprect,-3,road_palbank << 6,1,0,1,2); // -6 - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[2],0,4); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[2],0,4); - contcirc_draw_sprites_16x8(machine, bitmap,cliprect,5); // 7 + contcirc_draw_sprites_16x8(screen->machine, bitmap,cliprect,5); // 7 return 0; } @@ -875,7 +875,7 @@ VIDEO_UPDATE( chasehq ) { UINT8 layer[3]; - TC0100SCN_tilemap_update(machine); + TC0100SCN_tilemap_update(screen->machine); layer[0] = TC0100SCN_bottomlayer(0); layer[1] = layer[0]^1; @@ -886,12 +886,12 @@ VIDEO_UPDATE( chasehq ) /* Ensure screen blanked even when bottom layer not drawn due to disable bit */ fillbitmap(bitmap, 0, cliprect); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,0); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[1],0,1); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[1],0,1); TC0150ROD_draw(bitmap,cliprect,-1,0xc0,0,0,1,2); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[2],0,4); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[2],0,4); - chasehq_draw_sprites_16x16(machine, bitmap,cliprect,7); + chasehq_draw_sprites_16x16(screen->machine, bitmap,cliprect,7); return 0; } @@ -900,7 +900,7 @@ VIDEO_UPDATE( bshark ) { UINT8 layer[3]; - TC0100SCN_tilemap_update(machine); + TC0100SCN_tilemap_update(screen->machine); layer[0] = TC0100SCN_bottomlayer(0); layer[1] = layer[0]^1; @@ -911,12 +911,12 @@ VIDEO_UPDATE( bshark ) /* Ensure screen blanked even when bottom layer not drawn due to disable bit */ fillbitmap(bitmap, 0,cliprect); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,0); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[1],0,1); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[1],0,1); TC0150ROD_draw(bitmap,cliprect,-1,0xc0,0,1,1,2); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[2],0,4); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[2],0,4); - bshark_draw_sprites_16x8(machine, bitmap,cliprect,8); + bshark_draw_sprites_16x8(screen->machine, bitmap,cliprect,8); return 0; } @@ -925,7 +925,7 @@ VIDEO_UPDATE( sci ) { UINT8 layer[3]; - TC0100SCN_tilemap_update(machine); + TC0100SCN_tilemap_update(screen->machine); layer[0] = TC0100SCN_bottomlayer(0); layer[1] = layer[0]^1; @@ -936,12 +936,12 @@ VIDEO_UPDATE( sci ) /* Ensure screen blanked even when bottom layer not drawn due to disable bit */ fillbitmap(bitmap, 0, cliprect); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,0); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[1],0,1); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[1],0,1); TC0150ROD_draw(bitmap,cliprect,-1,0xc0,0,0,1,2); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[2],0,4); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[2],0,4); - sci_draw_sprites_16x8(machine, bitmap,cliprect,6); + sci_draw_sprites_16x8(screen->machine, bitmap,cliprect,6); return 0; } @@ -950,7 +950,7 @@ VIDEO_UPDATE( aquajack ) { UINT8 layer[3]; - TC0100SCN_tilemap_update(machine); + TC0100SCN_tilemap_update(screen->machine); layer[0] = TC0100SCN_bottomlayer(0); layer[1] = layer[0]^1; @@ -961,12 +961,12 @@ VIDEO_UPDATE( aquajack ) /* Ensure screen blanked even when bottom layer not drawn due to disable bit */ fillbitmap(bitmap, 0, cliprect); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,0); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[1],0,1); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[1],0,1); TC0150ROD_draw(bitmap,cliprect,-1,0,2,1,1,2); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[2],0,4); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[2],0,4); - aquajack_draw_sprites_16x8(machine, bitmap,cliprect,3); + aquajack_draw_sprites_16x8(screen->machine, bitmap,cliprect,3); return 0; } @@ -975,7 +975,7 @@ VIDEO_UPDATE( spacegun ) { UINT8 layer[3]; - TC0100SCN_tilemap_update(machine); + TC0100SCN_tilemap_update(screen->machine); layer[0] = TC0100SCN_bottomlayer(0); layer[1] = layer[0]^1; @@ -986,11 +986,11 @@ VIDEO_UPDATE( spacegun ) /* Ensure screen blanked even when bottom layer not drawn due to disable bit */ fillbitmap(bitmap, 0, cliprect); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,1); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[1],0,2); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[2],0,4); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,1); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[1],0,2); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[2],0,4); - spacegun_draw_sprites_16x8(machine, bitmap,cliprect,4); + spacegun_draw_sprites_16x8(screen->machine, bitmap,cliprect,4); return 0; } @@ -1001,7 +1001,7 @@ VIDEO_UPDATE( dblaxle ) UINT8 layer[5]; UINT16 priority; - TC0480SCP_tilemap_update(machine); + TC0480SCP_tilemap_update(screen->machine); priority = TC0480SCP_get_bg_priority(); @@ -1021,7 +1021,7 @@ VIDEO_UPDATE( dblaxle ) TC0480SCP_tilemap_draw(bitmap,cliprect,layer[2],0,1); TC0150ROD_draw(bitmap,cliprect,-1,0xc0,0,0,1,2); - bshark_draw_sprites_16x8(machine, bitmap,cliprect,7); + bshark_draw_sprites_16x8(screen->machine, bitmap,cliprect,7); /* This layer used for the big numeric displays */ TC0480SCP_tilemap_draw(bitmap,cliprect,layer[3],0,4); @@ -1029,5 +1029,3 @@ VIDEO_UPDATE( dblaxle ) TC0480SCP_tilemap_draw(bitmap,cliprect,layer[4],0,0); /* Text layer */ return 0; } - - diff --git a/src/mame/video/taitoair.c b/src/mame/video/taitoair.c index 9919542e841..592387d2de7 100644 --- a/src/mame/video/taitoair.c +++ b/src/mame/video/taitoair.c @@ -364,27 +364,27 @@ static void fill_poly(bitmap_t *bitmap, const struct poly *q) VIDEO_UPDATE( taitoair ) { - TC0080VCO_tilemap_update(machine); + TC0080VCO_tilemap_update(screen->machine); fillbitmap(bitmap, 0x41, cliprect); #ifdef MAME_DEBUG if ( !input_code_pressed(KEYCODE_A) ) - TC0080VCO_tilemap_draw(machine,bitmap,cliprect,0,0,0); + TC0080VCO_tilemap_draw(screen->machine,bitmap,cliprect,0,0,0); if ( !input_code_pressed(KEYCODE_S) ) draw_sprites(bitmap,cliprect,0); if ( !input_code_pressed(KEYCODE_D) ) - TC0080VCO_tilemap_draw(machine,bitmap,cliprect,1,0,0); + TC0080VCO_tilemap_draw(screen->machine,bitmap,cliprect,1,0,0); if ( !input_code_pressed(KEYCODE_F) ) draw_sprites(bitmap,cliprect,1); #else - TC0080VCO_tilemap_draw(machine,bitmap,cliprect,0,0,0); + TC0080VCO_tilemap_draw(screen->machine,bitmap,cliprect,0,0,0); draw_sprites (bitmap,cliprect,0); - TC0080VCO_tilemap_draw(machine,bitmap,cliprect,1,0,0); + TC0080VCO_tilemap_draw(screen->machine,bitmap,cliprect,1,0,0); draw_sprites (bitmap,cliprect,1); #endif - TC0080VCO_tilemap_draw(machine,bitmap,cliprect,2,0,0); + TC0080VCO_tilemap_draw(screen->machine,bitmap,cliprect,2,0,0); if(taitoair_line_ram[0x3fff]) { int adr = 0x3fff; diff --git a/src/mame/video/taitojc.c b/src/mame/video/taitojc.c index 31a3797f77c..b5919623477 100644 --- a/src/mame/video/taitojc.c +++ b/src/mame/video/taitojc.c @@ -275,7 +275,7 @@ VIDEO_UPDATE( taitojc ) } } - taitojc_tile_update(machine); + taitojc_tile_update(screen->machine); tilemap_draw(bitmap, cliprect, taitojc_tilemap, 0,0); /* diff --git a/src/mame/video/taitosj.c b/src/mame/video/taitosj.c index 53536fb35cf..cfa73209768 100644 --- a/src/mame/video/taitosj.c +++ b/src/mame/video/taitosj.c @@ -817,11 +817,11 @@ static int video_update_common(running_machine *machine, bitmap_t *bitmap, VIDEO_UPDATE( taitosj ) { - return video_update_common(machine, bitmap, cliprect, taitosj_copy_layer); + return video_update_common(screen->machine, bitmap, cliprect, taitosj_copy_layer); } VIDEO_UPDATE( kikstart ) { - return video_update_common(machine, bitmap, cliprect, kikstart_copy_layer); + return video_update_common(screen->machine, bitmap, cliprect, kikstart_copy_layer); } diff --git a/src/mame/video/tank8.c b/src/mame/video/tank8.c index 55c97e9f276..2a7565e8f33 100644 --- a/src/mame/video/tank8.c +++ b/src/mame/video/tank8.c @@ -202,10 +202,10 @@ static TIMER_CALLBACK( tank8_collision_callback ) VIDEO_UPDATE( tank8 ) { - set_pens(machine->colortable); + set_pens(screen->machine->colortable); tilemap_draw(bitmap, cliprect, tank8_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); draw_bullets(bitmap, cliprect); return 0; } diff --git a/src/mame/video/tankbatt.c b/src/mame/video/tankbatt.c index e8ad8a71672..fe72118f913 100644 --- a/src/mame/video/tankbatt.c +++ b/src/mame/video/tankbatt.c @@ -102,6 +102,6 @@ static void draw_bullets(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( tankbatt ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_bullets(machine, bitmap, cliprect); + draw_bullets(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/tankbust.c b/src/mame/video/tankbust.c index 9056fa5d178..6adc6bd0280 100644 --- a/src/mame/video/tankbust.c +++ b/src/mame/video/tankbust.c @@ -245,7 +245,7 @@ VIDEO_UPDATE( tankbust ) #endif tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, bg_tilemap, 1, 0); tilemap_draw(bitmap, cliprect, txt_tilemap, 0,0); diff --git a/src/mame/video/taotaido.c b/src/mame/video/taotaido.c index 37e0b743d3d..b25f045a6ae 100644 --- a/src/mame/video/taotaido.c +++ b/src/mame/video/taotaido.c @@ -210,10 +210,10 @@ VIDEO_UPDATE(taotaido) int line; rectangle clip; - clip.min_x = machine->screen[0].visarea.min_x; - clip.max_x = machine->screen[0].visarea.max_x; - clip.min_y = machine->screen[0].visarea.min_y; - clip.max_y = machine->screen[0].visarea.max_y; + clip.min_x = screen->machine->screen[0].visarea.min_x; + clip.max_x = screen->machine->screen[0].visarea.max_x; + clip.min_y = screen->machine->screen[0].visarea.min_y; + clip.max_y = screen->machine->screen[0].visarea.max_y; for (line = 0; line < 224;line++) { @@ -225,7 +225,7 @@ VIDEO_UPDATE(taotaido) tilemap_draw(bitmap,&clip,bg_tilemap,0,0); } - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/targeth.c b/src/mame/video/targeth.c index 9a0de5bfa6b..63b0fcda987 100644 --- a/src/mame/video/targeth.c +++ b/src/mame/video/targeth.c @@ -144,7 +144,7 @@ VIDEO_UPDATE( targeth ) tilemap_draw(bitmap,cliprect,pant[1],0,0); tilemap_draw(bitmap,cliprect,pant[0],0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/tatsumi.c b/src/mame/video/tatsumi.c index 2c790bcd140..ecac9a0ded1 100644 --- a/src/mame/video/tatsumi.c +++ b/src/mame/video/tatsumi.c @@ -999,11 +999,11 @@ static void draw_bg(running_machine *machine, bitmap_t *dst, tilemap *src, const VIDEO_UPDATE( apache3 ) { - update_cluts(machine, 1024, 0, 2048); + update_cluts(screen->machine, 1024, 0, 2048); - fillbitmap(bitmap,machine->pens[0],cliprect); - draw_sky(machine, bitmap, cliprect, 256, apache3_a0000[1]); - draw_sprites(machine, bitmap,cliprect,0, (tatsumi_sprite_control_ram[0x20]&0x1000) ? 0x1000 : 0); + fillbitmap(bitmap,screen->machine->pens[0],cliprect); + draw_sky(screen->machine, bitmap, cliprect, 256, apache3_a0000[1]); + draw_sprites(screen->machine, bitmap,cliprect,0, (tatsumi_sprite_control_ram[0x20]&0x1000) ? 0x1000 : 0); tilemap_draw(bitmap,cliprect,tx_layer,0,0); return 0; } @@ -1013,17 +1013,17 @@ VIDEO_UPDATE( roundup5 ) // UINT16 bg_x_scroll=roundup5_unknown1[0]; // UINT16 bg_y_scroll=roundup5_unknown2[0]; - update_cluts(machine, 1024, 512, 4096); + update_cluts(screen->machine, 1024, 512, 4096); tilemap_set_scrollx(tx_layer,0,24); tilemap_set_scrolly(tx_layer,0,0); //(((roundupt_crt_reg[0xe]<<8)|roundupt_crt_reg[0xf])>>5) + 96); - fillbitmap(bitmap,machine->pens[384],cliprect); // todo + fillbitmap(bitmap,screen->machine->pens[384],cliprect); // todo fillbitmap(priority_bitmap,0,cliprect); - draw_sprites(machine, priority_bitmap,cliprect,1,(tatsumi_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); // Alpha pass only - draw_road(machine, bitmap,cliprect,priority_bitmap); - draw_sprites(machine, bitmap,cliprect,0,(tatsumi_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); // Full pass + draw_sprites(screen->machine, priority_bitmap,cliprect,1,(tatsumi_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); // Alpha pass only + draw_road(screen->machine, bitmap,cliprect,priority_bitmap); + draw_sprites(screen->machine, bitmap,cliprect,0,(tatsumi_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); // Full pass tilemap_draw(bitmap,cliprect,tx_layer,0,0); return 0; } @@ -1040,14 +1040,14 @@ VIDEO_UPDATE( cyclwarr ) bigfight_last_bank=bigfight_bank; } - fillbitmap(bitmap,machine->pens[0],cliprect); + fillbitmap(bitmap,screen->machine->pens[0],cliprect); - draw_bg(machine, bitmap, layer3, &cyclwarr_videoram1[0x000], &cyclwarr_videoram1[0x100], cyclwarr_videoram1, bigfight_a40000[0], 8, -0x80, 512, 4096); - draw_bg(machine, bitmap, layer2, &cyclwarr_videoram1[0x200], &cyclwarr_videoram1[0x300], cyclwarr_videoram1, bigfight_a40000[0], 8, -0x80, 512, 4096); - draw_bg(machine, bitmap, layer1, &cyclwarr_videoram0[0x000], &cyclwarr_videoram0[0x100], cyclwarr_videoram0, bigfight_a40000[0], 8, -0x40, 1024, 2048); - update_cluts(machine, 8192, 4096, 8192); - draw_sprites(machine, bitmap,cliprect,0,(tatsumi_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); - draw_bg(machine, bitmap, layer0, &cyclwarr_videoram0[0x200], &cyclwarr_videoram0[0x300], cyclwarr_videoram0, bigfight_a40000[0], 0x10, -0x80, 512, 4096); + draw_bg(screen->machine, bitmap, layer3, &cyclwarr_videoram1[0x000], &cyclwarr_videoram1[0x100], cyclwarr_videoram1, bigfight_a40000[0], 8, -0x80, 512, 4096); + draw_bg(screen->machine, bitmap, layer2, &cyclwarr_videoram1[0x200], &cyclwarr_videoram1[0x300], cyclwarr_videoram1, bigfight_a40000[0], 8, -0x80, 512, 4096); + draw_bg(screen->machine, bitmap, layer1, &cyclwarr_videoram0[0x000], &cyclwarr_videoram0[0x100], cyclwarr_videoram0, bigfight_a40000[0], 8, -0x40, 1024, 2048); + update_cluts(screen->machine, 8192, 4096, 8192); + draw_sprites(screen->machine, bitmap,cliprect,0,(tatsumi_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); + draw_bg(screen->machine, bitmap, layer0, &cyclwarr_videoram0[0x200], &cyclwarr_videoram0[0x300], cyclwarr_videoram0, bigfight_a40000[0], 0x10, -0x80, 512, 4096); return 0; } @@ -1064,13 +1064,13 @@ VIDEO_UPDATE( bigfight ) bigfight_last_bank=bigfight_bank; } - fillbitmap(bitmap,machine->pens[0],cliprect); - draw_bg(machine, bitmap, layer3, &cyclwarr_videoram1[0x000], &cyclwarr_videoram1[0x100], cyclwarr_videoram1, bigfight_a40000[0], 8, -0x40, 1024, 2048); - draw_bg(machine, bitmap, layer2, &cyclwarr_videoram1[0x200], &cyclwarr_videoram1[0x300], cyclwarr_videoram1, bigfight_a40000[0], 8, -0x40, 1024, 2048); - draw_bg(machine, bitmap, layer1, &cyclwarr_videoram0[0x000], &cyclwarr_videoram0[0x100], cyclwarr_videoram0, bigfight_a40000[0], 8, -0x40, 1024, 2048); - update_cluts(machine, 8192, 4096, 8192); - draw_sprites(machine, bitmap,cliprect,0,(tatsumi_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); - draw_bg(machine, bitmap, layer0, &cyclwarr_videoram0[0x200], &cyclwarr_videoram0[0x300], cyclwarr_videoram0, bigfight_a40000[0], 0x10, -0x40, 1024, 2048); + fillbitmap(bitmap,screen->machine->pens[0],cliprect); + draw_bg(screen->machine, bitmap, layer3, &cyclwarr_videoram1[0x000], &cyclwarr_videoram1[0x100], cyclwarr_videoram1, bigfight_a40000[0], 8, -0x40, 1024, 2048); + draw_bg(screen->machine, bitmap, layer2, &cyclwarr_videoram1[0x200], &cyclwarr_videoram1[0x300], cyclwarr_videoram1, bigfight_a40000[0], 8, -0x40, 1024, 2048); + draw_bg(screen->machine, bitmap, layer1, &cyclwarr_videoram0[0x000], &cyclwarr_videoram0[0x100], cyclwarr_videoram0, bigfight_a40000[0], 8, -0x40, 1024, 2048); + update_cluts(screen->machine, 8192, 4096, 8192); + draw_sprites(screen->machine, bitmap,cliprect,0,(tatsumi_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); + draw_bg(screen->machine, bitmap, layer0, &cyclwarr_videoram0[0x200], &cyclwarr_videoram0[0x300], cyclwarr_videoram0, bigfight_a40000[0], 0x10, -0x40, 1024, 2048); return 0; } diff --git a/src/mame/video/taxidrvr.c b/src/mame/video/taxidrvr.c index 513ded6d1a9..51ae05fe457 100644 --- a/src/mame/video/taxidrvr.c +++ b/src/mame/video/taxidrvr.c @@ -38,7 +38,7 @@ VIDEO_UPDATE( taxidrvr ) sx = offs % 32; sy = offs / 32; - drawgfx(bitmap,machine->gfx[3], + drawgfx(bitmap,screen->machine->gfx[3], taxidrvr_vram3[offs], 0, 0,0, @@ -51,7 +51,7 @@ VIDEO_UPDATE( taxidrvr ) sx = offs % 32; sy = offs / 32; - drawgfx(bitmap,machine->gfx[2], + drawgfx(bitmap,screen->machine->gfx[2], taxidrvr_vram2[offs]+256*taxidrvr_vram2[offs+0x400], 0, 0,0, @@ -118,7 +118,7 @@ VIDEO_UPDATE( taxidrvr ) sx = offs % 32; sy = offs / 32; - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], taxidrvr_vram1[offs], 0, 0,0, @@ -146,7 +146,7 @@ VIDEO_UPDATE( taxidrvr ) sx = offs % 32; sy = offs / 32; - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], taxidrvr_vram0[offs], 0, 0,0, diff --git a/src/mame/video/tbowl.c b/src/mame/video/tbowl.c index 5faca9bc12b..6b8fda4c682 100644 --- a/src/mame/video/tbowl.c +++ b/src/mame/video/tbowl.c @@ -216,7 +216,7 @@ VIDEO_START( tbowl ) VIDEO_UPDATE( tbowl ) { - if (screen == 0) + if (scrnum == 0) { tilemap_set_scrollx(bg_tilemap, 0, tbowl_xscroll ); tilemap_set_scrolly(bg_tilemap, 0, tbowl_yscroll ); @@ -227,11 +227,11 @@ VIDEO_UPDATE( tbowl ) fillbitmap(bitmap,0x100,cliprect); /* is there a register controling the colour? looks odd when screen is blank */ tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect, 0); + draw_sprites(screen->machine, bitmap,cliprect, 0); tilemap_draw(bitmap,cliprect,bg2_tilemap,0,0); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); } - else if (screen ==1) + else if (scrnum ==1) { tilemap_set_scrollx(bg_tilemap, 0, tbowl_xscroll+32*8 ); tilemap_set_scrolly(bg_tilemap, 0, tbowl_yscroll ); @@ -242,7 +242,7 @@ VIDEO_UPDATE( tbowl ) fillbitmap(bitmap,0x100,cliprect); /* is there a register controling the colour? looks odd when screen is blank */ tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect, 32*8); + draw_sprites(screen->machine, bitmap,cliprect, 32*8); tilemap_draw(bitmap,cliprect,bg2_tilemap,0,0); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); } diff --git a/src/mame/video/tceptor.c b/src/mame/video/tceptor.c index 4feb48e1c76..b399fb73160 100644 --- a/src/mame/video/tceptor.c +++ b/src/mame/video/tceptor.c @@ -561,11 +561,11 @@ VIDEO_UPDATE( tceptor ) if (screen) { - int frame = video_screen_get_frame_number(screen); + int frame = video_screen_get_frame_number(scrnum); - if ((frame & 1) == 1 && screen == 1) + if ((frame & 1) == 1 && scrnum == 1) return UPDATE_HAS_NOT_CHANGED; - if ((frame & 1) == 0 && screen == 2) + if ((frame & 1) == 0 && scrnum == 2) return UPDATE_HAS_NOT_CHANGED; } @@ -585,9 +585,9 @@ VIDEO_UPDATE( tceptor ) for (pri = 0; pri < 8; pri++) { - namco_road_draw(machine, bitmap, cliprect, pri * 2); - namco_road_draw(machine, bitmap, cliprect, pri * 2 + 1); - draw_sprites(machine, bitmap, cliprect, pri); + namco_road_draw(screen->machine, bitmap, cliprect, pri * 2); + namco_road_draw(screen->machine, bitmap, cliprect, pri * 2 + 1); + draw_sprites(screen->machine, bitmap, cliprect, pri); } tilemap_draw(bitmap, cliprect, tx_tilemap, 0, 0); diff --git a/src/mame/video/tecmo.c b/src/mame/video/tecmo.c index a07858c72be..5cb8113867c 100644 --- a/src/mame/video/tecmo.c +++ b/src/mame/video/tecmo.c @@ -247,6 +247,6 @@ VIDEO_UPDATE( tecmo ) tilemap_draw(bitmap,cliprect,fg_tilemap,0,2); tilemap_draw(bitmap,cliprect,tx_tilemap,0,4); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/tecmo16.c b/src/mame/video/tecmo16.c index 8119faf6a14..e44757cfd20 100644 --- a/src/mame/video/tecmo16.c +++ b/src/mame/video/tecmo16.c @@ -499,9 +499,9 @@ VIDEO_UPDATE( tecmo16 ) tilemap_draw(tile_bitmap_fg, cliprect,tx_tilemap, 0, 4); /* draw sprites into a 16-bit bitmap */ - draw_sprites(machine, tile_bitmap_bg, tile_bitmap_fg, sprite_bitmap, cliprect); + draw_sprites(screen->machine, tile_bitmap_bg, tile_bitmap_fg, sprite_bitmap, cliprect); /* mix & blend the tilemaps and sprites into a 32-bit bitmap */ - blendbitmaps(machine, bitmap, tile_bitmap_bg, tile_bitmap_fg, sprite_bitmap, 0, 0, cliprect); + blendbitmaps(screen->machine, bitmap, tile_bitmap_bg, tile_bitmap_fg, sprite_bitmap, 0, 0, cliprect); return 0; } diff --git a/src/mame/video/tehkanwc.c b/src/mame/video/tehkanwc.c index 08a803d0e50..f1093a0b58b 100644 --- a/src/mame/video/tehkanwc.c +++ b/src/mame/video/tehkanwc.c @@ -192,9 +192,9 @@ VIDEO_UPDATE( tehkanwc ) tilemap_set_scrollx(bg_tilemap, 0, scroll_x[0] + 256 * scroll_x[1]); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, fg_tilemap, 1, 0); - gridiron_draw_led(machine, bitmap, cliprect, led0, 0); - gridiron_draw_led(machine, bitmap, cliprect, led1, 1); + gridiron_draw_led(screen->machine, bitmap, cliprect, led0, 0); + gridiron_draw_led(screen->machine, bitmap, cliprect, led1, 1); return 0; } diff --git a/src/mame/video/terracre.c b/src/mame/video/terracre.c index deb9d5d429d..2964ef291bc 100644 --- a/src/mame/video/terracre.c +++ b/src/mame/video/terracre.c @@ -199,11 +199,11 @@ VIDEO_START( amazon ) VIDEO_UPDATE( amazon ) { if( xscroll&0x2000 ) - fillbitmap( bitmap,get_black_pen(machine),cliprect ); + fillbitmap( bitmap,get_black_pen(screen->machine),cliprect ); else tilemap_draw( bitmap,cliprect, background, 0, 0 ); - draw_sprites( machine, bitmap,cliprect ); + draw_sprites(screen->machine, bitmap,cliprect ); tilemap_draw( bitmap,cliprect, foreground, 0, 0 ); return 0; } diff --git a/src/mame/video/tetrisp2.c b/src/mame/video/tetrisp2.c index 1e866b5e916..ed0fdef74a5 100644 --- a/src/mame/video/tetrisp2.c +++ b/src/mame/video/tetrisp2.c @@ -519,7 +519,7 @@ VIDEO_UPDATE( tetrisp2 ) flipscreen = (tetrisp2_systemregs[0x00] & 0x02); /* Black background color */ - fillbitmap(bitmap, machine->pens[0x0000], cliprect); + fillbitmap(bitmap, 0, cliprect); fillbitmap(priority_bitmap, 0, NULL); /* Flip Screen */ @@ -588,7 +588,7 @@ VIDEO_UPDATE( tetrisp2 ) else if (asc_pri == 2) tilemap_draw(bitmap,cliprect, tilemap_fg, 0, 1 << 2); - draw_sprites(machine, bitmap,cliprect, spriteram16, spriteram_size, 0); + draw_sprites(screen->machine, bitmap,cliprect, spriteram16, spriteram_size, 0); return 0; } @@ -604,7 +604,7 @@ VIDEO_UPDATE( rockntread ) flipscreen = (tetrisp2_systemregs[0x00] & 0x02); /* Black background color */ - fillbitmap(bitmap, machine->pens[0x0000], cliprect); + fillbitmap(bitmap, 0, cliprect); fillbitmap(priority_bitmap, 0, NULL); /* Flip Screen */ @@ -673,7 +673,7 @@ VIDEO_UPDATE( rockntread ) else if (asc_pri == 2) tilemap_draw(bitmap,cliprect, tilemap_fg, 0, 1 << 2); - draw_sprites(machine, bitmap,cliprect, spriteram16, spriteram_size, 0); + draw_sprites(screen->machine, bitmap,cliprect, spriteram16, spriteram_size, 0); return 0; } @@ -688,7 +688,7 @@ VIDEO_UPDATE( rocknms ) /* Black background color */ - if (screen==0) + if (scrnum==0) { tilemap_set_scrollx(tilemap_sub_bg, 0, rocknms_sub_scroll_bg[ 2 ] + 0x000); tilemap_set_scrolly(tilemap_sub_bg, 0, rocknms_sub_scroll_bg[ 5 ] + 0x000); @@ -697,7 +697,7 @@ VIDEO_UPDATE( rocknms ) tilemap_set_scrollx(tilemap_sub_rot, 0, rocknms_sub_rotregs[ 0 ] + 0x400); tilemap_set_scrolly(tilemap_sub_rot, 0, rocknms_sub_rotregs[ 2 ] + 0x400); - fillbitmap(bitmap, machine->pens[0x0000], cliprect); + fillbitmap(bitmap, screen->machine->pens[0x0000], cliprect); fillbitmap(priority_bitmap, 0, cliprect); asc_pri = scr_pri = rot_pri = 0; @@ -738,9 +738,9 @@ VIDEO_UPDATE( rocknms ) else if (asc_pri == 2) tilemap_draw(bitmap,cliprect, tilemap_sub_fg, 0, 1 << 2); - draw_sprites(machine, bitmap,cliprect, spriteram16_2, spriteram_2_size, 4); + draw_sprites(screen->machine, bitmap,cliprect, spriteram16_2, spriteram_2_size, 4); } - else if (screen==1) /* game screen */ + else if (scrnum==1) /* game screen */ { tilemap_set_scrollx(tilemap_bg, 0, tetrisp2_scroll_bg[ 2 ] + 0x000); tilemap_set_scrolly(tilemap_bg, 0, tetrisp2_scroll_bg[ 5 ] + 0x000); @@ -750,7 +750,7 @@ VIDEO_UPDATE( rocknms ) tilemap_set_scrolly(tilemap_rot, 0, tetrisp2_rotregs[ 2 ] + 0x400); /* Black background color */ - fillbitmap(bitmap, machine->pens[0x0000], cliprect); + fillbitmap(bitmap, screen->machine->pens[0x0000], cliprect); fillbitmap(priority_bitmap, 0, cliprect); asc_pri = scr_pri = rot_pri = 0; @@ -791,7 +791,7 @@ VIDEO_UPDATE( rocknms ) else if (asc_pri == 2) tilemap_draw(bitmap,cliprect, tilemap_fg, 0, 1 << 2); - draw_sprites(machine, bitmap,cliprect, spriteram16, spriteram_size, 0); + draw_sprites(screen->machine, bitmap,cliprect, spriteram16, spriteram_size, 0); } return 0; diff --git a/src/mame/video/thedeep.c b/src/mame/video/thedeep.c index f16ce47e3cd..1e9f5926721 100644 --- a/src/mame/video/thedeep.c +++ b/src/mame/video/thedeep.c @@ -227,10 +227,10 @@ VIDEO_UPDATE( thedeep ) tilemap_set_scrolly(tilemap_0, x, y + scrolly); } - fillbitmap(bitmap,get_black_pen(machine),cliprect); + fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); tilemap_draw(bitmap,cliprect,tilemap_0,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,tilemap_1,0,0); return 0; } diff --git a/src/mame/video/thepit.c b/src/mame/video/thepit.c index 45ce51957a3..67098f1ff5f 100644 --- a/src/mame/video/thepit.c +++ b/src/mame/video/thepit.c @@ -300,13 +300,13 @@ VIDEO_UPDATE( thepit ) tilemap_draw(bitmap, cliprect, thepit_tilemap, 0, 0); /* low priority sprites */ - draw_sprites(machine, bitmap, cliprect, 0); + draw_sprites(screen->machine, bitmap, cliprect, 0); /* high priority tiles */ tilemap_draw(bitmap, cliprect, thepit_solid_tilemap, 1, 1); /* high priority sprites */ - draw_sprites(machine, bitmap, cliprect, 1); + draw_sprites(screen->machine, bitmap, cliprect, 1); return 0; } diff --git a/src/mame/video/thoop2.c b/src/mame/video/thoop2.c index c70eebde9cd..4f2b6ad2112 100644 --- a/src/mame/video/thoop2.c +++ b/src/mame/video/thoop2.c @@ -215,28 +215,28 @@ VIDEO_UPDATE( thoop2 ) tilemap_draw(bitmap,cliprect,pant[1],TILEMAP_DRAW_LAYER1 | 3,0); tilemap_draw(bitmap,cliprect,pant[0],TILEMAP_DRAW_LAYER1 | 3,0); - draw_sprites(machine, bitmap,cliprect,3); + draw_sprites(screen->machine, bitmap,cliprect,3); tilemap_draw(bitmap,cliprect,pant[1],TILEMAP_DRAW_LAYER0 | 3,0); tilemap_draw(bitmap,cliprect,pant[0],TILEMAP_DRAW_LAYER0 | 3,0); tilemap_draw(bitmap,cliprect,pant[1],TILEMAP_DRAW_LAYER1 | 2,0); tilemap_draw(bitmap,cliprect,pant[0],TILEMAP_DRAW_LAYER1 | 2,0); - draw_sprites(machine, bitmap,cliprect,2); + draw_sprites(screen->machine, bitmap,cliprect,2); tilemap_draw(bitmap,cliprect,pant[1],TILEMAP_DRAW_LAYER0 | 2,0); tilemap_draw(bitmap,cliprect,pant[0],TILEMAP_DRAW_LAYER0 | 2,0); tilemap_draw(bitmap,cliprect,pant[1],TILEMAP_DRAW_LAYER1 | 1,0); tilemap_draw(bitmap,cliprect,pant[0],TILEMAP_DRAW_LAYER1 | 1,0); - draw_sprites(machine, bitmap,cliprect,1); + draw_sprites(screen->machine, bitmap,cliprect,1); tilemap_draw(bitmap,cliprect,pant[1],TILEMAP_DRAW_LAYER0 | 1,0); tilemap_draw(bitmap,cliprect,pant[0],TILEMAP_DRAW_LAYER0 | 1,0); tilemap_draw(bitmap,cliprect,pant[1],TILEMAP_DRAW_LAYER1 | 0,0); tilemap_draw(bitmap,cliprect,pant[0],TILEMAP_DRAW_LAYER1 | 0,0); - draw_sprites(machine, bitmap,cliprect,0); + draw_sprites(screen->machine, bitmap,cliprect,0); tilemap_draw(bitmap,cliprect,pant[1],TILEMAP_DRAW_LAYER0 | 0,0); tilemap_draw(bitmap,cliprect,pant[0],TILEMAP_DRAW_LAYER0 | 0,0); - draw_sprites(machine, bitmap,cliprect,4); + draw_sprites(screen->machine, bitmap,cliprect,4); return 0; } diff --git a/src/mame/video/thunderj.c b/src/mame/video/thunderj.c index c1de6605cd8..f911b219b92 100644 --- a/src/mame/video/thunderj.c +++ b/src/mame/video/thunderj.c @@ -170,7 +170,7 @@ VIDEO_UPDATE( thunderj ) tilemap_draw(bitmap, cliprect, atarigen_playfield2_tilemap, 3, 0x8c); /* draw and merge the MO */ - mobitmap = atarimo_render(machine, 0, cliprect, &rectlist); + mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) { diff --git a/src/mame/video/tia.c b/src/mame/video/tia.c index d18ec02f30c..bd0b59f5b82 100644 --- a/src/mame/video/tia.c +++ b/src/mame/video/tia.c @@ -283,7 +283,7 @@ VIDEO_START( tia ) VIDEO_UPDATE( tia ) { - screen_height = machine->screen[0].height; + screen_height = screen->machine->screen[0].height; copybitmap(bitmap, helper[2], 0, 0, 0, 0, cliprect); return 0; } diff --git a/src/mame/video/tiamc1.c b/src/mame/video/tiamc1.c index 85ccb10f4c0..67e816ea6cd 100644 --- a/src/mame/video/tiamc1.c +++ b/src/mame/video/tiamc1.c @@ -202,7 +202,7 @@ VIDEO_UPDATE( tiamc1 ) tilemap_draw(bitmap, cliprect, bg_tilemap1, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c index affda4cbe65..8b2602afad8 100644 --- a/src/mame/video/tigeroad.c +++ b/src/mame/video/tigeroad.c @@ -157,9 +157,9 @@ VIDEO_START( tigeroad ) VIDEO_UPDATE( tigeroad ) { tilemap_draw(bitmap, cliprect, bg_tilemap, TILEMAP_DRAW_LAYER1, 0); - draw_sprites(machine, bitmap, cliprect, 0); + draw_sprites(screen->machine, bitmap, cliprect, 0); tilemap_draw(bitmap, cliprect, bg_tilemap, TILEMAP_DRAW_LAYER0, 1); - //draw_sprites(machine, bitmap, cliprect, 1); draw priority sprites? + //draw_sprites(screen->machine, bitmap, cliprect, 1); draw priority sprites? tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 2); return 0; } diff --git a/src/mame/video/timelimt.c b/src/mame/video/timelimt.c index 6f41077ec1c..bf35270eca8 100644 --- a/src/mame/video/timelimt.c +++ b/src/mame/video/timelimt.c @@ -145,7 +145,7 @@ VIDEO_UPDATE( timelimt ) tilemap_set_scrolly(bg_tilemap, 0, scrolly); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); return 0; diff --git a/src/mame/video/timeplt.c b/src/mame/video/timeplt.c index 0048023fa97..20a71eece4b 100644 --- a/src/mame/video/timeplt.c +++ b/src/mame/video/timeplt.c @@ -191,7 +191,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( timeplt ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,bg_tilemap,1,0); return 0; } diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c index e53870ba8d3..9e84e571f76 100644 --- a/src/mame/video/tmnt.c +++ b/src/mame/video/tmnt.c @@ -751,21 +751,21 @@ VIDEO_UPDATE( tmnt2 ) // dim all colors before it for (i=0; i<cb; i++) - palette_set_brightness(machine,i,brt); + palette_set_brightness(screen->machine,i,brt); // reset all colors in range for (i=cb; i<ce; i++) - palette_set_brightness(machine,i,1.0); + palette_set_brightness(screen->machine,i,1.0); // dim all colors after it for (i=ce; i<2048; i++) - palette_set_brightness(machine,i,brt); + palette_set_brightness(screen->machine,i,brt); // toggle shadow/highlight if (~dim_c & 0x10) - palette_set_shadow_mode(machine, 1); + palette_set_shadow_mode(screen->machine, 1); else - palette_set_shadow_mode(machine, 0); + palette_set_shadow_mode(screen->machine, 0); } VIDEO_UPDATE_CALL(lgtnfght); diff --git a/src/mame/video/tnzs.c b/src/mame/video/tnzs.c index 1aca4a7574c..d341126fde3 100644 --- a/src/mame/video/tnzs.c +++ b/src/mame/video/tnzs.c @@ -200,10 +200,10 @@ VIDEO_UPDATE( tnzs ) fillbitmap(bitmap, 0x1f0, cliprect); /* Redraw the background tiles (c400-c5ff) */ - draw_background(machine, bitmap, cliprect, tnzs_objram + 0x400); + draw_background(screen->machine, bitmap, cliprect, tnzs_objram + 0x400); /* Draw the sprites on top */ - draw_foreground(machine, bitmap, cliprect, + draw_foreground(screen->machine, bitmap, cliprect, tnzs_objram + 0x0000, /* chars : c000 */ tnzs_objram + 0x0200, /* x : c200 */ tnzs_vdcram + 0x0000, /* y : f000 */ diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c index dd5d7ffa890..8e4ff505fdd 100644 --- a/src/mame/video/toaplan1.c +++ b/src/mame/video/toaplan1.c @@ -1163,7 +1163,7 @@ VIDEO_UPDATE( rallybik ) tilemap_draw(bitmap,cliprect,pf3_tilemap,priority,0); tilemap_draw(bitmap,cliprect,pf2_tilemap,priority,0); tilemap_draw(bitmap,cliprect,pf1_tilemap,priority,0); - rallybik_draw_sprites(machine, bitmap,cliprect,priority << 8); + rallybik_draw_sprites(screen->machine, bitmap,cliprect,priority << 8); } return 0; } @@ -1191,7 +1191,7 @@ VIDEO_UPDATE( toaplan1 ) tilemap_draw_primask(bitmap,cliprect,pf1_tilemap,priority,priority,0); } - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); return 0; } @@ -1217,7 +1217,7 @@ VIDEO_UPDATE( demonwld ) tilemap_draw_primask(bitmap,cliprect,pf1_tilemap,priority,priority,0); } - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c index b3c17d8a923..05b6e21e789 100644 --- a/src/mame/video/toaplan2.c +++ b/src/mame/video/toaplan2.c @@ -1557,10 +1557,10 @@ VIDEO_UPDATE( batrider_0 ) draw_sprites(bitmap,cliprect,0,priority,1); /* consider bank select */ } - clip.min_x = machine->screen[0].visarea.min_x; - clip.max_x = machine->screen[0].visarea.max_x; - clip.min_y = machine->screen[0].visarea.min_y; - clip.max_y = machine->screen[0].visarea.max_y; + clip.min_x = screen->machine->screen[0].visarea.min_x; + clip.max_x = screen->machine->screen[0].visarea.max_x; + clip.min_y = screen->machine->screen[0].visarea.min_y; + clip.max_y = screen->machine->screen[0].visarea.max_y; /* used for 'for use in' and '8ing' screen on bbakraid, raizing on batrider */ for (line = 0; line < 256;line++) diff --git a/src/mame/video/toki.c b/src/mame/video/toki.c index ed1a4e3ed9b..ac85ef05a7f 100644 --- a/src/mame/video/toki.c +++ b/src/mame/video/toki.c @@ -293,7 +293,7 @@ VIDEO_UPDATE( toki ) tilemap_draw(bitmap,cliprect,foreground_layer,TILEMAP_DRAW_OPAQUE,0); tilemap_draw(bitmap,cliprect,background_layer,0,0); } - toki_draw_sprites(machine, bitmap,cliprect); + toki_draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,text_layer,0,0); return 0; } @@ -315,7 +315,7 @@ VIDEO_UPDATE( tokib ) tilemap_draw(bitmap,cliprect,background_layer,0,0); } - tokib_draw_sprites(machine, bitmap,cliprect); + tokib_draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,text_layer,0,0); return 0; } diff --git a/src/mame/video/toobin.c b/src/mame/video/toobin.c index e340d82ad9b..64537ebc7f9 100644 --- a/src/mame/video/toobin.c +++ b/src/mame/video/toobin.c @@ -240,7 +240,7 @@ VIDEO_UPDATE( toobin ) tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 3, 3); /* draw and merge the MO */ - mobitmap = atarimo_render(machine, 0, cliprect, &rectlist); + mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) { diff --git a/src/mame/video/topspeed.c b/src/mame/video/topspeed.c index 1613cfa10b9..b50aaa6bc69 100644 --- a/src/mame/video/topspeed.c +++ b/src/mame/video/topspeed.c @@ -192,7 +192,7 @@ VIDEO_UPDATE( topspeed ) if (dislayer[4]==0) #endif - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/toypop.c b/src/mame/video/toypop.c index d915bcf2412..1cc8d0a60e0 100644 --- a/src/mame/video/toypop.c +++ b/src/mame/video/toypop.c @@ -229,7 +229,6 @@ VIDEO_UPDATE( toypop ) { draw_background(bitmap); tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - - mappy_draw_sprites(machine, bitmap, cliprect, -31, -8, 0xff); + mappy_draw_sprites(screen->machine, bitmap, cliprect, -31, -8, 0xff); return 0; } diff --git a/src/mame/video/tp84.c b/src/mame/video/tp84.c index fb90923fa17..620db66a60d 100644 --- a/src/mame/video/tp84.c +++ b/src/mame/video/tp84.c @@ -184,7 +184,7 @@ VIDEO_UPDATE( tp84 ) { rectangle clip = *cliprect; - if (cliprect->min_y == machine->screen[screen].visarea.min_y) + if (cliprect->min_y == screen->machine->screen[scrnum].visarea.min_y) { tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); @@ -196,16 +196,16 @@ VIDEO_UPDATE( tp84 ) } tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); /* draw top status region */ - clip.min_x = machine->screen[0].visarea.min_x; - clip.max_x = machine->screen[0].visarea.min_x + 15; + clip.min_x = screen->machine->screen[0].visarea.min_x; + clip.max_x = screen->machine->screen[0].visarea.min_x + 15; tilemap_draw(bitmap, &clip, fg_tilemap, 0, 0); /* draw bottom status region */ - clip.min_x = machine->screen[0].visarea.max_x - 15; - clip.max_x = machine->screen[0].visarea.max_x; + clip.min_x = screen->machine->screen[0].visarea.max_x - 15; + clip.max_x = screen->machine->screen[0].visarea.max_x; tilemap_draw(bitmap, &clip, fg_tilemap, 0, 0); return 0; diff --git a/src/mame/video/trackfld.c b/src/mame/video/trackfld.c index 60424c26381..2867d4c3b55 100644 --- a/src/mame/video/trackfld.c +++ b/src/mame/video/trackfld.c @@ -243,6 +243,6 @@ VIDEO_UPDATE( trackfld ) } tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/travrusa.c b/src/mame/video/travrusa.c index 298b35fe52e..a639a1ba7cf 100644 --- a/src/mame/video/travrusa.c +++ b/src/mame/video/travrusa.c @@ -340,7 +340,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( travrusa ) { tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER1,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_LAYER0,0); return 0; } diff --git a/src/mame/video/triplhnt.c b/src/mame/video/triplhnt.c index 03b0c0ef865..238d9054ec9 100644 --- a/src/mame/video/triplhnt.c +++ b/src/mame/video/triplhnt.c @@ -140,9 +140,9 @@ VIDEO_UPDATE( triplhnt ) tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); - discrete_sound_w(machine, TRIPLHNT_BEAR_ROAR_DATA, triplhnt_playfield_ram[0xfa] & 15); - discrete_sound_w(machine, TRIPLHNT_SHOT_DATA, triplhnt_playfield_ram[0xfc] & 15); + discrete_sound_w(screen->machine, TRIPLHNT_BEAR_ROAR_DATA, triplhnt_playfield_ram[0xfa] & 15); + discrete_sound_w(screen->machine, TRIPLHNT_SHOT_DATA, triplhnt_playfield_ram[0xfc] & 15); return 0; } diff --git a/src/mame/video/tryout.c b/src/mame/video/tryout.c index 2ff6a98aab7..9510b029803 100644 --- a/src/mame/video/tryout.c +++ b/src/mame/video/tryout.c @@ -257,7 +257,7 @@ VIDEO_UPDATE( tryout ) tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); // popmessage("%02x %02x %02x - %04x",mem[0xe402],mem[0xe403],mem[0xe404], ((tryout_gfx_control[0]&1)<<8) | ((tryout_gfx_control[0]&4)<<7)); return 0; diff --git a/src/mame/video/tsamurai.c b/src/mame/video/tsamurai.c index 1cd083654e5..aa1d3208d07 100644 --- a/src/mame/video/tsamurai.c +++ b/src/mame/video/tsamurai.c @@ -218,7 +218,7 @@ VIDEO_UPDATE( tsamurai ) */ fillbitmap(bitmap,bgcolor,cliprect); tilemap_draw(bitmap,cliprect,background,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,foreground,0,0); return 0; } @@ -272,6 +272,6 @@ VIDEO_UPDATE( vsgongf ) #endif tilemap_draw(bitmap,cliprect,foreground,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/tumbleb.c b/src/mame/video/tumbleb.c index a445f305c88..40eaff15c78 100644 --- a/src/mame/video/tumbleb.c +++ b/src/mame/video/tumbleb.c @@ -559,7 +559,7 @@ VIDEO_UPDATE( tumblepb ) tilemap_draw(bitmap,cliprect,pf1_tilemap,0,0); else tilemap_draw(bitmap,cliprect,pf1_alt_tilemap,0,0); - tumblepb_draw_sprites(machine,bitmap,cliprect); + tumblepb_draw_sprites(screen->machine,bitmap,cliprect); return 0; } @@ -584,7 +584,7 @@ VIDEO_UPDATE( jumpkids ) tilemap_draw(bitmap,cliprect,pf1_tilemap,0,0); else tilemap_draw(bitmap,cliprect,pf1_alt_tilemap,0,0); - jumpkids_draw_sprites(machine,bitmap,cliprect); + jumpkids_draw_sprites(screen->machine,bitmap,cliprect); return 0; } @@ -609,7 +609,7 @@ VIDEO_UPDATE( semicom ) tilemap_draw(bitmap,cliprect,pf1_tilemap,0,0); else tilemap_draw(bitmap,cliprect,pf1_alt_tilemap,0,0); - jumpkids_draw_sprites(machine,bitmap,cliprect); + jumpkids_draw_sprites(screen->machine,bitmap,cliprect); return 0; } @@ -635,7 +635,7 @@ VIDEO_UPDATE( semicom_altoffsets ) tilemap_draw(bitmap,cliprect,pf1_tilemap,0,0); else tilemap_draw(bitmap,cliprect,pf1_alt_tilemap,0,0); - jumpkids_draw_sprites(machine,bitmap,cliprect); + jumpkids_draw_sprites(screen->machine,bitmap,cliprect); return 0; } @@ -660,7 +660,7 @@ VIDEO_UPDATE( bcstory ) tilemap_draw(bitmap,cliprect,pf1_tilemap,0,0); else tilemap_draw(bitmap,cliprect,pf1_alt_tilemap,0,0); - jumpkids_draw_sprites(machine,bitmap,cliprect); + jumpkids_draw_sprites(screen->machine,bitmap,cliprect); return 0; } @@ -687,7 +687,7 @@ VIDEO_UPDATE( semibase ) tilemap_draw(bitmap,cliprect,pf1_tilemap,0,0); else tilemap_draw(bitmap,cliprect,pf1_alt_tilemap,0,0); - jumpkids_draw_sprites(machine,bitmap,cliprect); + jumpkids_draw_sprites(screen->machine,bitmap,cliprect); return 0; } @@ -714,7 +714,7 @@ VIDEO_UPDATE( sdfight ) tilemap_draw(bitmap,cliprect,pf1_tilemap,0,0); else tilemap_draw(bitmap,cliprect,pf1_alt_tilemap,0,0); - jumpkids_draw_sprites(machine,bitmap,cliprect); + jumpkids_draw_sprites(screen->machine,bitmap,cliprect); return 0; } @@ -741,14 +741,14 @@ VIDEO_UPDATE( fncywld ) tilemap_draw(bitmap,cliprect,pf1_tilemap,0,0); else tilemap_draw(bitmap,cliprect,pf1_alt_tilemap,0,0); - fncywld_draw_sprites(machine,bitmap,cliprect); + fncywld_draw_sprites(screen->machine,bitmap,cliprect); return 0; } VIDEO_UPDATE( jumppop ) { -// fillbitmap(bitmap, get_black_pen(machine), cliprect); +// fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); tilemap_set_scrollx( pf1_tilemap,0, jumppop_control[2]-0x3a0 ); tilemap_set_scrolly( pf1_tilemap,0, jumppop_control[3] ); @@ -771,7 +771,7 @@ VIDEO_UPDATE( jumppop ) //popmessage("%04x %04x %04x %04x %04x %04x %04x %04x", jumppop_control[0],jumppop_control[1],jumppop_control[2],jumppop_control[3],jumppop_control[4],jumppop_control[5],jumppop_control[6],jumppop_control[7]); - jumpkids_draw_sprites(machine,bitmap,cliprect); + jumpkids_draw_sprites(screen->machine,bitmap,cliprect); return 0; } @@ -786,7 +786,7 @@ VIDEO_UPDATE( suprtrio ) tilemap_draw(bitmap,cliprect,pf2_tilemap,0,0); tilemap_draw(bitmap,cliprect,pf1_alt_tilemap,0,0); - jumpkids_draw_sprites(machine,bitmap,cliprect); + jumpkids_draw_sprites(screen->machine,bitmap,cliprect); #if 0 popmessage("%04x %04x %04x %04x %04x %04x %04x %04x", suprtrio_control[0], @@ -823,7 +823,7 @@ VIDEO_UPDATE( pangpang ) tilemap_draw(bitmap,cliprect,pf1_tilemap,0,0); else tilemap_draw(bitmap,cliprect,pf1_alt_tilemap,0,0); - jumpkids_draw_sprites(machine,bitmap,cliprect); + jumpkids_draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/tumblep.c b/src/mame/video/tumblep.c index 867ec8fcc4f..6f51123f230 100644 --- a/src/mame/video/tumblep.c +++ b/src/mame/video/tumblep.c @@ -95,6 +95,6 @@ VIDEO_UPDATE(tumblep) deco16_tilemap_2_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE,0); deco16_tilemap_1_draw(bitmap,cliprect,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/tunhunt.c b/src/mame/video/tunhunt.c index 19f234247a1..e552b0dcffd 100644 --- a/src/mame/video/tunhunt.c +++ b/src/mame/video/tunhunt.c @@ -371,13 +371,13 @@ static void draw_shell(running_machine *machine, VIDEO_UPDATE( tunhunt ) { - set_pens(machine->colortable); + set_pens(screen->machine->colortable); draw_box(bitmap, cliprect); draw_motion_object(bitmap, cliprect); - draw_shell(machine, bitmap, cliprect, + draw_shell(screen->machine, bitmap, cliprect, tunhunt_ram[SHL0PC], /* picture code */ tunhunt_ram[SHEL0H], /* hposition */ tunhunt_ram[SHL0V], /* vstart */ @@ -385,7 +385,7 @@ VIDEO_UPDATE( tunhunt ) tunhunt_ram[SHL0ST], /* vstretch */ tunhunt_control&0x08 ); /* hstretch */ - draw_shell(machine, bitmap, cliprect, + draw_shell(screen->machine, bitmap, cliprect, tunhunt_ram[SHL1PC], /* picture code */ tunhunt_ram[SHEL1H], /* hposition */ tunhunt_ram[SHL1V], /* vstart */ diff --git a/src/mame/video/turbo.c b/src/mame/video/turbo.c index 92bd590b670..4a086ba4a16 100644 --- a/src/mame/video/turbo.c +++ b/src/mame/video/turbo.c @@ -397,7 +397,7 @@ static UINT32 turbo_get_sprite_bits(UINT8 road, sprite_info *sprinfo) VIDEO_UPDATE( turbo ) { - turbo_state *state = machine->driver_data; + turbo_state *state = screen->machine->driver_data; bitmap_t *fgpixmap = tilemap_get_pixmap(state->fg_tilemap); const UINT8 *road_gfxdata = memory_region(REGION_GFX3); const UINT8 *prom_base = memory_region(REGION_PROMS); @@ -752,7 +752,7 @@ static UINT32 subroc3d_get_sprite_bits(sprite_info *sprinfo, UINT8 *plb) VIDEO_UPDATE( subroc3d ) { - turbo_state *state = machine->driver_data; + turbo_state *state = screen->machine->driver_data; bitmap_t *fgpixmap = tilemap_get_pixmap(state->fg_tilemap); const UINT8 *prom_base = memory_region(REGION_PROMS); const UINT8 *pr1419 = prom_base + 0x000; @@ -971,7 +971,7 @@ static UINT32 buckrog_get_sprite_bits(sprite_info *sprinfo, UINT8 *plb) VIDEO_UPDATE( buckrog ) { - turbo_state *state = machine->driver_data; + turbo_state *state = screen->machine->driver_data; bitmap_t *fgpixmap = tilemap_get_pixmap(state->fg_tilemap); const UINT8 *bgcolor = memory_region(REGION_GFX3); const UINT8 *prom_base = memory_region(REGION_PROMS); diff --git a/src/mame/video/twincobr.c b/src/mame/video/twincobr.c index 88310ce1b94..7d5d0cc276f 100644 --- a/src/mame/video/twincobr.c +++ b/src/mame/video/twincobr.c @@ -503,11 +503,11 @@ VIDEO_UPDATE( toaplan0 ) fillbitmap(bitmap,0,cliprect); tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_OPAQUE,0); - draw_sprites(machine, bitmap,cliprect,0x0400); + draw_sprites(screen->machine, bitmap,cliprect,0x0400); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect,0x0800); + draw_sprites(screen->machine, bitmap,cliprect,0x0800); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect,0x0c00); + draw_sprites(screen->machine, bitmap,cliprect,0x0c00); return 0; } diff --git a/src/mame/video/tx1.c b/src/mame/video/tx1.c index 1fe79ca80ad..1c832cfeaa2 100644 --- a/src/mame/video/tx1.c +++ b/src/mame/video/tx1.c @@ -488,7 +488,7 @@ VIDEO_UPDATE( tx1 ) { int y; - if ( screen == 0 ) + if ( scrnum == 0 ) { rectangle rect = { 0, 768 - 1, 0, 240 - 1 }; @@ -499,7 +499,7 @@ VIDEO_UPDATE( tx1 ) } for (y = 0; y < 240; ++y) - memcpy(BITMAP_ADDR16(bitmap, y, 0), BITMAP_ADDR16(tx1_bitmap, y, screen * 256), sizeof(UINT16) * 256); + memcpy(BITMAP_ADDR16(bitmap, y, 0), BITMAP_ADDR16(tx1_bitmap, y, scrnum * 256), sizeof(UINT16) * 256); return 0; } @@ -1608,7 +1608,7 @@ VIDEO_START( buggyboy ) VIDEO_UPDATE( buggyboy ) { /* The video hardware seems to use one large tilemap, scroll it to the right position for each screen */ - int xscrollamount = screen * 256; + int xscrollamount = scrnum * 256; tilemap_set_scrollx(buggyboy_tilemap, 0, xscrollamount); tilemap_draw(bitmap, cliprect, buggyboy_tilemap, TILEMAP_DRAW_OPAQUE, 0); diff --git a/src/mame/video/ultratnk.c b/src/mame/video/ultratnk.c index a6bbed7a5e1..009d851726b 100644 --- a/src/mame/video/ultratnk.c +++ b/src/mame/video/ultratnk.c @@ -78,7 +78,7 @@ VIDEO_UPDATE( ultratnk ) if (!(attr & 0x80)) { - drawgfx(bitmap, machine->gfx[1], + drawgfx(bitmap, screen->machine->gfx[1], (code >> 3) | bank, i, 0, 0, diff --git a/src/mame/video/undrfire.c b/src/mame/video/undrfire.c index 780ae28fd96..26a7914e512 100644 --- a/src/mame/video/undrfire.c +++ b/src/mame/video/undrfire.c @@ -274,8 +274,8 @@ VIDEO_UPDATE( undrfire ) } #endif - TC0100SCN_tilemap_update(machine); - TC0480SCP_tilemap_update(machine); + TC0100SCN_tilemap_update(screen->machine); + TC0480SCP_tilemap_update(screen->machine); priority = TC0480SCP_get_bg_priority(); @@ -299,8 +299,8 @@ VIDEO_UPDATE( undrfire ) pointless - it's always hidden by other layers. Does it serve some blending pupose ? */ - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,pivlayer[0],0,0); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,pivlayer[1],0,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,pivlayer[0],0,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,pivlayer[1],0,0); #ifdef MAME_DEBUG if (dislayer[layer[0]]==0) @@ -330,26 +330,26 @@ VIDEO_UPDATE( undrfire ) if ((TC0480SCP_pri_reg &0x3) == 3) /* on road levels kludge sprites up 1 priority */ { static const int primasks[4] = {0xfff0, 0xff00, 0x0, 0x0}; - draw_sprites(machine, bitmap,cliprect,primasks,44,-574); + draw_sprites(screen->machine, bitmap,cliprect,primasks,44,-574); } else { static const int primasks[4] = {0xfffc, 0xfff0, 0xff00, 0x0}; - draw_sprites(machine, bitmap,cliprect,primasks,44,-574); + draw_sprites(screen->machine, bitmap,cliprect,primasks,44,-574); } } #ifdef MAME_DEBUG if (dislayer[5]==0) #endif - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,pivlayer[2],0,0); /* piv text layer */ + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,pivlayer[2],0,0); /* piv text layer */ TC0480SCP_tilemap_draw(bitmap,cliprect,layer[4],0,0); /* TC0480SCP text layer */ /* See if we should draw artificial gun targets */ /* (not yet implemented...) */ - if (input_port_7_word_r(machine,0,0) & 0x1) /* Fake DSW */ + if (input_port_7_word_r(screen->machine,0,0) & 0x1) /* Fake DSW */ { popmessage("Gunsights on"); } diff --git a/src/mame/video/unico.c b/src/mame/video/unico.c index 2d5f7a93d55..825f3b987b0 100644 --- a/src/mame/video/unico.c +++ b/src/mame/video/unico.c @@ -367,7 +367,7 @@ if ( input_code_pressed(KEYCODE_Z) || input_code_pressed(KEYCODE_X) ) if (layers_ctrl & 4) tilemap_draw(bitmap,cliprect,tilemap_2,0,4); /* Sprites are drawn last, using pdrawgfx */ - if (layers_ctrl & 8) unico_draw_sprites(machine, bitmap,cliprect); + if (layers_ctrl & 8) unico_draw_sprites(screen->machine, bitmap,cliprect); return 0; } @@ -406,7 +406,7 @@ if ( input_code_pressed(KEYCODE_Z) || input_code_pressed(KEYCODE_X) ) if (layers_ctrl & 4) tilemap_draw(bitmap,cliprect,tilemap_2,0,4); /* Sprites are drawn last, using pdrawgfx */ - if (layers_ctrl & 8) zeropnt2_draw_sprites(machine, bitmap,cliprect); + if (layers_ctrl & 8) zeropnt2_draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/vaportra.c b/src/mame/video/vaportra.c index 8f22c003cc6..64b61843b88 100644 --- a/src/mame/video/vaportra.c +++ b/src/mame/video/vaportra.c @@ -160,29 +160,29 @@ VIDEO_UPDATE( vaportra ) if (pri==0) { deco16_tilemap_4_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE,0); deco16_tilemap_3_draw(bitmap,cliprect,0,0); - draw_sprites(machine, bitmap,cliprect,0); + draw_sprites(screen->machine, bitmap,cliprect,0); deco16_tilemap_2_draw(bitmap,cliprect,0,0); } else if (pri==1) { deco16_tilemap_3_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE,0); deco16_tilemap_4_draw(bitmap,cliprect,0,0); - draw_sprites(machine, bitmap,cliprect,0); + draw_sprites(screen->machine, bitmap,cliprect,0); deco16_tilemap_2_draw(bitmap,cliprect,0,0); } else if (pri==2) { deco16_tilemap_4_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE,0); deco16_tilemap_2_draw(bitmap,cliprect,0,0); - draw_sprites(machine, bitmap,cliprect,0); + draw_sprites(screen->machine, bitmap,cliprect,0); deco16_tilemap_3_draw(bitmap,cliprect,0,0); } else { deco16_tilemap_3_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE,0); deco16_tilemap_2_draw(bitmap,cliprect,0,0); - draw_sprites(machine, bitmap,cliprect,0); + draw_sprites(screen->machine, bitmap,cliprect,0); deco16_tilemap_4_draw(bitmap,cliprect,0,0); } - draw_sprites(machine,bitmap,cliprect,1); + draw_sprites(screen->machine,bitmap,cliprect,1); deco16_tilemap_1_draw(bitmap,cliprect,0,0); return 0; } diff --git a/src/mame/video/vastar.c b/src/mame/video/vastar.c index de63599d579..0c18c002ae5 100644 --- a/src/mame/video/vastar.c +++ b/src/mame/video/vastar.c @@ -201,14 +201,14 @@ VIDEO_UPDATE( vastar ) { case 0: tilemap_draw(bitmap,cliprect, bg1_tilemap, TILEMAP_DRAW_OPAQUE,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect, bg2_tilemap, 0,0); tilemap_draw(bitmap,cliprect, fg_tilemap, 0,0); break; case 2: tilemap_draw(bitmap,cliprect, bg1_tilemap, TILEMAP_DRAW_OPAQUE,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect, bg1_tilemap, 0,0); tilemap_draw(bitmap,cliprect, bg2_tilemap, 0,0); tilemap_draw(bitmap,cliprect, fg_tilemap, 0,0); @@ -218,7 +218,7 @@ VIDEO_UPDATE( vastar ) tilemap_draw(bitmap,cliprect, bg1_tilemap, TILEMAP_DRAW_OPAQUE,0); tilemap_draw(bitmap,cliprect, bg2_tilemap, 0,0); tilemap_draw(bitmap,cliprect, fg_tilemap, 0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); break; default: diff --git a/src/mame/video/vball.c b/src/mame/video/vball.c index 20bab818837..c5b34fd9d38 100644 --- a/src/mame/video/vball.c +++ b/src/mame/video/vball.c @@ -172,7 +172,7 @@ VIDEO_UPDATE( vb ) //logerror("scrollx[%d] = %d\n",i,scrollx[i]); } tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/vendetta.c b/src/mame/video/vendetta.c index 3941a678eac..1bd7bbe3fab 100644 --- a/src/mame/video/vendetta.c +++ b/src/mame/video/vendetta.c @@ -119,6 +119,6 @@ VIDEO_UPDATE( vendetta ) tilemap_draw(bitmap,cliprect,K052109_tilemap[layer[1]],0,2); tilemap_draw(bitmap,cliprect,K052109_tilemap[layer[2]],0,4); - K053247_sprites_draw(machine, bitmap,cliprect); + K053247_sprites_draw(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/victory.c b/src/mame/video/victory.c index ade8e33c100..de260bac5cf 100644 --- a/src/mame/video/victory.c +++ b/src/mame/video/victory.c @@ -1105,7 +1105,7 @@ VIDEO_UPDATE( victory ) int x, y; /* copy the palette from palette RAM */ - set_palette(machine); + set_palette(screen->machine); /* update the foreground & background */ update_foreground(); diff --git a/src/mame/video/videopin.c b/src/mame/video/videopin.c index 2df95b32ecf..d7cbe432a93 100644 --- a/src/mame/video/videopin.c +++ b/src/mame/video/videopin.c @@ -85,7 +85,7 @@ VIDEO_UPDATE( videopin ) { for (j = 0; j < 2; j++) { - drawgfx(bitmap, machine->gfx[1], + drawgfx(bitmap, screen->machine->gfx[1], 0, 0, 0, 0, x + 16 * i, diff --git a/src/mame/video/vigilant.c b/src/mame/video/vigilant.c index fd890f55c4c..d1764c02ae3 100644 --- a/src/mame/video/vigilant.c +++ b/src/mame/video/vigilant.c @@ -283,27 +283,27 @@ VIDEO_UPDATE( vigilant ) g = (paletteram[0x500 + 16 * rear_color + i] << 3) & 0xFF; b = (paletteram[0x600 + 16 * rear_color + i] << 3) & 0xFF; - palette_set_color(machine,512 + i,MAKE_RGB(r,g,b)); + palette_set_color(screen->machine,512 + i,MAKE_RGB(r,g,b)); r = (paletteram[0x400 + 16 * rear_color + 32 + i] << 3) & 0xFF; g = (paletteram[0x500 + 16 * rear_color + 32 + i] << 3) & 0xFF; b = (paletteram[0x600 + 16 * rear_color + 32 + i] << 3) & 0xFF; - palette_set_color(machine,512 + 16 + i,MAKE_RGB(r,g,b)); + palette_set_color(screen->machine,512 + 16 + i,MAKE_RGB(r,g,b)); } if (rear_disable) /* opaque foreground */ { - draw_foreground(machine,bitmap,cliprect,0,1); - draw_sprites(machine,bitmap,&bottomvisiblearea); - draw_foreground(machine,bitmap,cliprect,1,0); + draw_foreground(screen->machine,bitmap,cliprect,0,1); + draw_sprites(screen->machine,bitmap,&bottomvisiblearea); + draw_foreground(screen->machine,bitmap,cliprect,1,0); } else { - draw_background(machine,bitmap,cliprect); - draw_foreground(machine,bitmap,cliprect,0,0); - draw_sprites(machine,bitmap,&bottomvisiblearea); - draw_foreground(machine,bitmap,cliprect,1,0); // priority tiles + draw_background(screen->machine,bitmap,cliprect); + draw_foreground(screen->machine,bitmap,cliprect,0,0); + draw_sprites(screen->machine,bitmap,&bottomvisiblearea); + draw_foreground(screen->machine,bitmap,cliprect,1,0); // priority tiles } return 0; } @@ -321,7 +321,7 @@ VIDEO_UPDATE( kikcubic ) int color = (attributes & 0xF0) >> 4; int tile_number = videoram[offs] | ((attributes & 0x0F) << 8); - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], tile_number, color, 0,0, @@ -329,6 +329,6 @@ VIDEO_UPDATE( kikcubic ) cliprect,TRANSPARENCY_NONE,0); } - draw_sprites(machine,bitmap,cliprect); + draw_sprites(screen->machine,bitmap,cliprect); return 0; } diff --git a/src/mame/video/vindictr.c b/src/mame/video/vindictr.c index 23b393cc82d..87ad4e80a29 100644 --- a/src/mame/video/vindictr.c +++ b/src/mame/video/vindictr.c @@ -232,7 +232,7 @@ VIDEO_UPDATE( vindictr ) tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); /* draw and merge the MO */ - mobitmap = atarimo_render(machine, 0, cliprect, &rectlist); + mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) { diff --git a/src/mame/video/volfied.c b/src/mame/video/volfied.c index ce9fc6f013c..ce6d8a1ce13 100644 --- a/src/mame/video/volfied.c +++ b/src/mame/video/volfied.c @@ -125,9 +125,7 @@ static void refresh_pixel_layer(running_machine *machine, bitmap_t *bitmap) VIDEO_UPDATE( volfied ) { fillbitmap(priority_bitmap, 0, cliprect); - - refresh_pixel_layer(machine, bitmap); - - PC090OJ_draw_sprites(machine, bitmap, cliprect, 0); + refresh_pixel_layer(screen->machine, bitmap); + PC090OJ_draw_sprites(screen->machine, bitmap, cliprect, 0); return 0; } diff --git a/src/mame/video/vsnes.c b/src/mame/video/vsnes.c index 804247ca7ad..3a1a9d79e13 100644 --- a/src/mame/video/vsnes.c +++ b/src/mame/video/vsnes.c @@ -72,6 +72,6 @@ VIDEO_UPDATE( vsnes ) VIDEO_UPDATE( vsdual ) { /* render the ppu's */ - ppu2c0x_render( screen, bitmap, 0, 0, 0, 0 ); + ppu2c0x_render( scrnum, bitmap, 0, 0, 0, 0 ); return 0; } diff --git a/src/mame/video/vulgus.c b/src/mame/video/vulgus.c index f84c41ba172..532a3070ae4 100644 --- a/src/mame/video/vulgus.c +++ b/src/mame/video/vulgus.c @@ -222,7 +222,7 @@ VIDEO_UPDATE( vulgus ) tilemap_set_scrolly(bg_tilemap, 0, vulgus_scroll_low[0] + 256 * vulgus_scroll_high[0]); tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); return 0; } diff --git a/src/mame/video/warriorb.c b/src/mame/video/warriorb.c index 041ee7b2d9b..41b8995b6d3 100644 --- a/src/mame/video/warriorb.c +++ b/src/mame/video/warriorb.c @@ -107,10 +107,10 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( warriorb ) { - int xoffs = 40*8*screen; + int xoffs = 40*8*scrnum; UINT8 layer[3], nodraw; - TC0100SCN_tilemap_update(machine); + TC0100SCN_tilemap_update(screen->machine); layer[0] = TC0100SCN_bottomlayer(0); layer[1] = layer[0]^1; @@ -121,18 +121,18 @@ VIDEO_UPDATE( warriorb ) /* chip 0 does tilemaps on the left, chip 1 does the ones on the right */ // draw bottom layer - nodraw = TC0100SCN_tilemap_draw(machine,bitmap,cliprect,screen,layer[0],TILEMAP_DRAW_OPAQUE,0); /* left */ + nodraw = TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,scrnum,layer[0],TILEMAP_DRAW_OPAQUE,0); /* left */ /* Ensure screen blanked even when bottom layers not drawn due to disable bit */ - if(nodraw) fillbitmap(bitmap, get_black_pen(machine), cliprect); + if(nodraw) fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); // draw middle layer - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,screen,layer[1],0,1); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,scrnum,layer[1],0,1); /* Sprites can be under/over the layer below text layer */ - draw_sprites(machine, bitmap,cliprect,xoffs,8); // draw sprites + draw_sprites(screen->machine, bitmap,cliprect,xoffs,8); // draw sprites // draw top(text) layer - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,screen,layer[2],0,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,scrnum,layer[2],0,0); return 0; } diff --git a/src/mame/video/wc90.c b/src/mame/video/wc90.c index 04d410cc827..d8a7fe862bc 100644 --- a/src/mame/video/wc90.c +++ b/src/mame/video/wc90.c @@ -355,12 +355,12 @@ VIDEO_UPDATE( wc90 ) tilemap_set_scrollx(tx_tilemap,0,wc90_scroll0xlo[0] + 256 * wc90_scroll0xhi[0]); tilemap_set_scrolly(tx_tilemap,0,wc90_scroll0ylo[0] + 256 * wc90_scroll0yhi[0]); -// draw_sprites(machine, bitmap,cliprect, 3 ); +// draw_sprites(screen->machine, bitmap,cliprect, 3 ); tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect, 2 ); + draw_sprites(screen->machine, bitmap,cliprect, 2 ); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect, 1 ); + draw_sprites(screen->machine, bitmap,cliprect, 1 ); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect, 0 ); + draw_sprites(screen->machine, bitmap,cliprect, 0 ); return 0; } diff --git a/src/mame/video/wc90b.c b/src/mame/video/wc90b.c index 6efa43409b5..19779f55b82 100644 --- a/src/mame/video/wc90b.c +++ b/src/mame/video/wc90b.c @@ -140,12 +140,12 @@ VIDEO_UPDATE( wc90b ) tilemap_set_scrollx(fg_tilemap,0,8 * wc90b_scroll1x[0] + 256); tilemap_set_scrolly(fg_tilemap,0,wc90b_scroll1y[0] + ((wc90b_scroll1y[0] < 0x10 || wc90b_scroll1y[0] == 0xff) ? 256 : 0)); -// draw_sprites(machine, bitmap,cliprect, 3 ); +// draw_sprites(screen->machine, bitmap,cliprect, 3 ); tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect, 2 ); + draw_sprites(screen->machine, bitmap,cliprect, 2 ); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect, 1 ); + draw_sprites(screen->machine, bitmap,cliprect, 1 ); tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect, 0 ); + draw_sprites(screen->machine, bitmap,cliprect, 0 ); return 0; } diff --git a/src/mame/video/wecleman.c b/src/mame/video/wecleman.c index 5a14364d513..244802f35e1 100644 --- a/src/mame/video/wecleman.c +++ b/src/mame/video/wecleman.c @@ -1022,7 +1022,7 @@ VIDEO_UPDATE ( wecleman ) int cloud_sx, cloud_sy; int i, j, k; - mrct = machine->pens; + mrct = screen->machine->pens; video_on = wecleman_irqctrl & 0x40; @@ -1054,12 +1054,12 @@ VIDEO_UPDATE ( wecleman ) /* palette hacks! */ ((pen_t *)mrct)[0x27] = mrct[0x24]; - get_sprite_info(machine); + get_sprite_info(screen->machine); - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); /* Draw the road (lines which have priority 0x02) */ - if (video_on) wecleman_draw_road(machine, bitmap, cliprect, 0x02); + if (video_on) wecleman_draw_road(screen->machine, bitmap, cliprect, 0x02); /* Draw the background */ if (video_on) tilemap_draw(bitmap,cliprect, bg_tilemap, 0, 0); @@ -1071,9 +1071,9 @@ VIDEO_UPDATE ( wecleman ) ((pen_t *)mrct)[0] = ((pen_t *)mrct)[0x40] = ((pen_t *)mrct)[0x200] = ((pen_t *)mrct)[0x205]; if (video_on) - draw_cloud(machine, + draw_cloud(screen->machine, bitmap, - machine->gfx[0], + screen->machine->gfx[0], wecleman_pageram+0x1800, BMP_PAD, BMP_PAD, 41, 20, @@ -1093,7 +1093,7 @@ VIDEO_UPDATE ( wecleman ) if (video_on) tilemap_draw(bitmap,cliprect, fg_tilemap, 0, 0); /* Draw the road (lines which have priority 0x04) */ - if (video_on) wecleman_draw_road(machine, bitmap,cliprect, 0x04); + if (video_on) wecleman_draw_road(screen->machine, bitmap,cliprect, 0x04); /* Draw the sprites */ if (video_on) sprite_draw(bitmap,cliprect); @@ -1115,15 +1115,15 @@ VIDEO_UPDATE( hotchase ) set_led_status(0, wecleman_selected_ip & 0x04); // Start lamp - get_sprite_info(machine); + get_sprite_info(screen->machine); - fillbitmap(bitmap, get_black_pen(machine), cliprect); + fillbitmap(bitmap, get_black_pen(screen->machine), cliprect); /* Draw the background */ if (video_on) K051316_zoom_draw_0(bitmap,cliprect, 0, 0); /* Draw the road */ - if (video_on) hotchase_draw_road(machine, bitmap, cliprect); + if (video_on) hotchase_draw_road(screen->machine, bitmap, cliprect); /* Draw the sprites */ if (video_on) sprite_draw(bitmap,cliprect); diff --git a/src/mame/video/welltris.c b/src/mame/video/welltris.c index 4bf22f88a14..3f09e240a79 100644 --- a/src/mame/video/welltris.c +++ b/src/mame/video/welltris.c @@ -245,6 +245,6 @@ VIDEO_UPDATE( welltris ) draw_background(bitmap, cliprect); tilemap_draw(bitmap, cliprect, char_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/wgp.c b/src/mame/video/wgp.c index 85c8fb74897..05a91818840 100644 --- a/src/mame/video/wgp.c +++ b/src/mame/video/wgp.c @@ -699,7 +699,7 @@ VIDEO_UPDATE( wgp ) tilemap_set_scrolly(wgp_piv_tilemap[i], 0, wgp_piv_scrolly[i]); } - TC0100SCN_tilemap_update(machine); + TC0100SCN_tilemap_update(screen->machine); fillbitmap(bitmap, 0, cliprect); @@ -730,7 +730,7 @@ VIDEO_UPDATE( wgp ) #endif wgp_piv_layer_draw(bitmap,cliprect,layer[2],0,4); - draw_sprites(machine, bitmap,cliprect,16); + draw_sprites(screen->machine, bitmap,cliprect,16); /* ... then here we should apply rotation from wgp_sate_ctrl[] to the bitmap before we draw the TC0100SCN layers on it */ @@ -739,13 +739,13 @@ VIDEO_UPDATE( wgp ) layer[1] = layer[0]^1; layer[2] = 2; - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[0],0,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0],0,0); #ifdef MAME_DEBUG if (dislayer[3]==0) #endif - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[1],0,0); - TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,layer[2],0,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[1],0,0); + TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[2],0,0); #if 0 { diff --git a/src/mame/video/williams.c b/src/mame/video/williams.c index 19e8b3f7b8d..71e42a9b903 100644 --- a/src/mame/video/williams.c +++ b/src/mame/video/williams.c @@ -258,7 +258,7 @@ VIDEO_UPDATE( blaster ) pens[x] = palette_lookup[paletteram[x]]; /* if we're blitting from the top, start with a 0 for color 0 */ - if (cliprect->min_y == machine->screen[0].visarea.min_y || !(blaster_video_control & 1)) + if (cliprect->min_y == screen->machine->screen[0].visarea.min_y || !(blaster_video_control & 1)) blaster_color0 = pens[0]; /* loop over rows */ @@ -300,7 +300,7 @@ VIDEO_UPDATE( williams2 ) /* fetch the relevant pens */ for (x = 1; x < 16; x++) - pens[x] = palette_get_color(machine, williams2_fg_color * 16 + x); + pens[x] = palette_get_color(screen->machine, williams2_fg_color * 16 + x); /* loop over rows */ for (y = cliprect->min_y; y <= cliprect->max_y; y++) diff --git a/src/mame/video/wiping.c b/src/mame/video/wiping.c index 9c0bc5165f6..a3c80d4d24e 100644 --- a/src/mame/video/wiping.c +++ b/src/mame/video/wiping.c @@ -120,7 +120,7 @@ VIDEO_UPDATE( wiping ) sy = 27 - sy; } - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], videoram[offs], colorram[offs] & 0x3f, flipscreen,flipscreen, @@ -149,13 +149,13 @@ VIDEO_UPDATE( wiping ) flipy = !flipy; } - drawgfx(bitmap,machine->gfx[1], + drawgfx(bitmap,screen->machine->gfx[1], (spriteram[offs] & 0x3f) + 64 * otherbank, color, flipx,flipy, sx,sy, - &machine->screen[0].visarea,TRANSPARENCY_PENS, - colortable_get_transpen_mask(machine->colortable, machine->gfx[1], color, 0x1f)); + cliprect,TRANSPARENCY_PENS, + colortable_get_transpen_mask(screen->machine->colortable, screen->machine->gfx[1], color, 0x1f)); } /* redraw high priority chars */ @@ -190,12 +190,12 @@ VIDEO_UPDATE( wiping ) sy = 27 - sy; } - drawgfx(bitmap,machine->gfx[0], + drawgfx(bitmap,screen->machine->gfx[0], videoram[offs], colorram[offs] & 0x3f, flipscreen,flipscreen, sx*8,sy*8, - &machine->screen[0].visarea,TRANSPARENCY_NONE,0); + cliprect,TRANSPARENCY_NONE,0); } } diff --git a/src/mame/video/wiz.c b/src/mame/video/wiz.c index 4c26bccf6e2..bad10e5d80c 100644 --- a/src/mame/video/wiz.c +++ b/src/mame/video/wiz.c @@ -227,10 +227,10 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, VIDEO_UPDATE( kungfut ) { fillbitmap(bitmap,bgpen,cliprect); - draw_background(machine, bitmap, cliprect, 2 + char_bank[0] , 0); - draw_foreground(machine, bitmap, cliprect, 0); - draw_sprites(machine, bitmap, cliprect, spriteram_2, 4); - draw_sprites(machine, bitmap, cliprect, spriteram , 5); + draw_background(screen->machine, bitmap, cliprect, 2 + char_bank[0] , 0); + draw_foreground(screen->machine, bitmap, cliprect, 0); + draw_sprites(screen->machine, bitmap, cliprect, spriteram_2, 4); + draw_sprites(screen->machine, bitmap, cliprect, spriteram , 5); return 0; } @@ -240,15 +240,15 @@ VIDEO_UPDATE( wiz ) const rectangle* visible_area; fillbitmap(bitmap,bgpen,cliprect); - draw_background(machine, bitmap, cliprect, 2 + ((char_bank[0] << 1) | char_bank[1]), 0); - draw_foreground(machine, bitmap, cliprect, 0); + draw_background(screen->machine, bitmap, cliprect, 2 + ((char_bank[0] << 1) | char_bank[1]), 0); + draw_foreground(screen->machine, bitmap, cliprect, 0); visible_area = flipx ? &spritevisibleareaflipx : &spritevisiblearea; bank = 7 + *wiz_sprite_bank; - draw_sprites(machine, bitmap, visible_area, spriteram_2, 6); - draw_sprites(machine, bitmap, visible_area, spriteram , bank); + draw_sprites(screen->machine, bitmap, visible_area, spriteram_2, 6); + draw_sprites(screen->machine, bitmap, visible_area, spriteram , bank); return 0; } @@ -256,9 +256,9 @@ VIDEO_UPDATE( wiz ) VIDEO_UPDATE( stinger ) { fillbitmap(bitmap,bgpen,cliprect); - draw_background(machine, bitmap, cliprect, 2 + char_bank[0], 1); - draw_foreground(machine, bitmap, cliprect, 1); - draw_sprites(machine, bitmap, cliprect, spriteram_2, 4); - draw_sprites(machine, bitmap, cliprect, spriteram , 5); + draw_background(screen->machine, bitmap, cliprect, 2 + char_bank[0], 1); + draw_foreground(screen->machine, bitmap, cliprect, 1); + draw_sprites(screen->machine, bitmap, cliprect, spriteram_2, 4); + draw_sprites(screen->machine, bitmap, cliprect, spriteram , 5); return 0; } diff --git a/src/mame/video/wolfpack.c b/src/mame/video/wolfpack.c index 3e32be4403d..fe8061fd22f 100644 --- a/src/mame/video/wolfpack.c +++ b/src/mame/video/wolfpack.c @@ -271,10 +271,10 @@ VIDEO_UPDATE( wolfpack ) if (wolfpack_ship_size & 0x40) color += 0x3a; if (wolfpack_ship_size & 0x80) color += 0x48; - colortable_palette_set_color(machine->colortable, 3, MAKE_RGB(color,color,color)); - colortable_palette_set_color(machine->colortable, 7, MAKE_RGB(color < 0xb8 ? color + 0x48 : 0xff, - color < 0xb8 ? color + 0x48 : 0xff, - color < 0xb8 ? color + 0x48 : 0xff)); + colortable_palette_set_color(screen->machine->colortable, 3, MAKE_RGB(color,color,color)); + colortable_palette_set_color(screen->machine->colortable, 7, MAKE_RGB(color < 0xb8 ? color + 0x48 : 0xff, + color < 0xb8 ? color + 0x48 : 0xff, + color < 0xb8 ? color + 0x48 : 0xff)); fillbitmap(bitmap, wolfpack_video_invert, cliprect); @@ -283,7 +283,7 @@ VIDEO_UPDATE( wolfpack ) { int code = wolfpack_alpha_num_ram[32 * i + j]; - drawgfx(bitmap, machine->gfx[0], + drawgfx(bitmap, screen->machine->gfx[0], code, wolfpack_video_invert, 0, 0, @@ -293,10 +293,10 @@ VIDEO_UPDATE( wolfpack ) TRANSPARENCY_NONE, 0); } - draw_pt(machine, bitmap, cliprect); - draw_ship(machine, bitmap, cliprect); - draw_torpedo(machine, bitmap, cliprect); - draw_water(machine->colortable, bitmap, cliprect); + draw_pt(screen->machine, bitmap, cliprect); + draw_ship(screen->machine, bitmap, cliprect); + draw_torpedo(screen->machine, bitmap, cliprect); + draw_water(screen->machine->colortable, bitmap, cliprect); return 0; } diff --git a/src/mame/video/wrally.c b/src/mame/video/wrally.c index b228526f258..d8232027ac0 100644 --- a/src/mame/video/wrally.c +++ b/src/mame/video/wrally.c @@ -167,6 +167,6 @@ VIDEO_UPDATE( wrally ) tilemap_draw(bitmap,cliprect,pant[1],0,0); tilemap_draw(bitmap,cliprect,pant[0],0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/wwfsstar.c b/src/mame/video/wwfsstar.c index 3267f40c1f7..6b66d9e0fa9 100644 --- a/src/mame/video/wwfsstar.c +++ b/src/mame/video/wwfsstar.c @@ -218,7 +218,7 @@ VIDEO_UPDATE( wwfsstar ) tilemap_set_scrollx( bg0_tilemap, 0, wwfsstar_scrollx ); tilemap_draw(bitmap,cliprect,bg0_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect ); + draw_sprites(screen->machine, bitmap,cliprect ); tilemap_draw(bitmap,cliprect,fg0_tilemap,0,0); return 0; diff --git a/src/mame/video/wwfwfest.c b/src/mame/video/wwfwfest.c index 86fa681130a..41dbeaba522 100644 --- a/src/mame/video/wwfwfest.c +++ b/src/mame/video/wwfwfest.c @@ -263,13 +263,13 @@ VIDEO_UPDATE( wwfwfest ) if (wwfwfest_pri == 0x007b) { tilemap_draw(bitmap,cliprect,bg0_tilemap,TILEMAP_DRAW_OPAQUE,0); tilemap_draw(bitmap,cliprect,bg1_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,fg0_tilemap,0,0); } if (wwfwfest_pri == 0x007c) { tilemap_draw(bitmap,cliprect,bg0_tilemap,TILEMAP_DRAW_OPAQUE,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,bg1_tilemap,0,0); tilemap_draw(bitmap,cliprect,fg0_tilemap,0,0); } @@ -277,7 +277,7 @@ VIDEO_UPDATE( wwfwfest ) if (wwfwfest_pri == 0x0078) { tilemap_draw(bitmap,cliprect,bg1_tilemap,TILEMAP_DRAW_OPAQUE,0); tilemap_draw(bitmap,cliprect,bg0_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,fg0_tilemap,0,0); } return 0; diff --git a/src/mame/video/xain.c b/src/mame/video/xain.c index ca3805dc2e5..2fe0426bfcf 100644 --- a/src/mame/video/xain.c +++ b/src/mame/video/xain.c @@ -225,48 +225,48 @@ VIDEO_UPDATE( xain ) case 0: tilemap_draw(bitmap,cliprect,bgram0_tilemap,TILEMAP_DRAW_OPAQUE,0); tilemap_draw(bitmap,cliprect,bgram1_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,char_tilemap,0,0); break; case 1: tilemap_draw(bitmap,cliprect,bgram1_tilemap,TILEMAP_DRAW_OPAQUE,0); tilemap_draw(bitmap,cliprect,bgram0_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,char_tilemap,0,0); break; case 2: tilemap_draw(bitmap,cliprect,char_tilemap,TILEMAP_DRAW_OPAQUE,0); tilemap_draw(bitmap,cliprect,bgram0_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,bgram1_tilemap,0,0); break; case 3: tilemap_draw(bitmap,cliprect,char_tilemap,TILEMAP_DRAW_OPAQUE,0); tilemap_draw(bitmap,cliprect,bgram1_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,bgram0_tilemap,0,0); break; case 4: tilemap_draw(bitmap,cliprect,bgram0_tilemap,TILEMAP_DRAW_OPAQUE,0); tilemap_draw(bitmap,cliprect,char_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,bgram1_tilemap,0,0); break; case 5: tilemap_draw(bitmap,cliprect,bgram1_tilemap,TILEMAP_DRAW_OPAQUE,0); tilemap_draw(bitmap,cliprect,char_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,bgram0_tilemap,0,0); break; case 6: tilemap_draw(bitmap,cliprect,bgram0_tilemap,TILEMAP_DRAW_OPAQUE,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,bgram1_tilemap,0,0); tilemap_draw(bitmap,cliprect,char_tilemap,0,0); break; case 7: tilemap_draw(bitmap,cliprect,bgram1_tilemap,TILEMAP_DRAW_OPAQUE,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,bgram0_tilemap,0,0); tilemap_draw(bitmap,cliprect,char_tilemap,0,0); break; diff --git a/src/mame/video/xevious.c b/src/mame/video/xevious.c index ae44ac35760..4a4405d3f44 100644 --- a/src/mame/video/xevious.c +++ b/src/mame/video/xevious.c @@ -510,7 +510,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( xevious ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,fg_tilemap,0,0); return 0; } diff --git a/src/mame/video/xexex.c b/src/mame/video/xexex.c index 7c4a807168a..f65e6937c51 100644 --- a/src/mame/video/xexex.c +++ b/src/mame/video/xexex.c @@ -109,8 +109,8 @@ VIDEO_UPDATE( xexex ) sortlayers(layer, layerpri); - K054338_update_all_shadows(machine); - K054338_fill_backcolor(machine, bitmap, 0); + K054338_update_all_shadows(screen->machine); + K054338_fill_backcolor(screen->machine, bitmap, 0); fillbitmap(priority_bitmap, 0, cliprect); @@ -118,15 +118,15 @@ VIDEO_UPDATE( xexex ) { if (layer[plane] < 0) { - K053250_draw(machine, bitmap, cliprect, 0, bg_colorbase, 0, 1<<plane); + K053250_draw(screen->machine, bitmap, cliprect, 0, bg_colorbase, 0, 1<<plane); } else if (!cur_alpha || layer[plane] != 1) { - K056832_tilemap_draw(machine, bitmap, cliprect, layer[plane], 0, 1<<plane); + K056832_tilemap_draw(screen->machine, bitmap, cliprect, layer[plane], 0, 1<<plane); } } - K053247_sprites_draw(machine, bitmap, cliprect); + K053247_sprites_draw(screen->machine, bitmap, cliprect); if (cur_alpha) { @@ -134,10 +134,10 @@ VIDEO_UPDATE( xexex ) if (alpha > 0) { - K056832_tilemap_draw(machine, bitmap, cliprect, 1, (alpha >= 255) ? 0 : TILEMAP_DRAW_ALPHA, 0); + K056832_tilemap_draw(screen->machine, bitmap, cliprect, 1, (alpha >= 255) ? 0 : TILEMAP_DRAW_ALPHA, 0); } } - K056832_tilemap_draw(machine, bitmap, cliprect, 0, 0, 0); + K056832_tilemap_draw(screen->machine, bitmap, cliprect, 0, 0, 0); return 0; } diff --git a/src/mame/video/xmen.c b/src/mame/video/xmen.c index 07a1b7da95b..bfa6fae7c28 100644 --- a/src/mame/video/xmen.c +++ b/src/mame/video/xmen.c @@ -124,7 +124,7 @@ VIDEO_UPDATE( xmen ) tilemap_draw(bitmap,cliprect,K052109_tilemap[layer[2]],0,4); pdrawgfx_shadow_lowpri = 1; /* fix shadows of boulders in front of feet */ - K053247_sprites_draw(machine, bitmap,cliprect); + K053247_sprites_draw(screen->machine, bitmap,cliprect); return 0; } @@ -150,7 +150,7 @@ VIDEO_UPDATE( xmen6p ) UINT16* line_dest = BITMAP_ADDR16(bitmap, y, 0); UINT16* line_src; - if (screen==0) line_src = BITMAP_ADDR16(screen_left, y, 0); + if (scrnum==0) line_src = BITMAP_ADDR16(screen_left, y, 0); else line_src = BITMAP_ADDR16(screen_right, y, 0); for (x=12*8;x<52*8;x++) diff --git a/src/mame/video/xorworld.c b/src/mame/video/xorworld.c index f37ad67882d..c9a2cd11c22 100644 --- a/src/mame/video/xorworld.c +++ b/src/mame/video/xorworld.c @@ -110,6 +110,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( xorworld ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/xxmissio.c b/src/mame/video/xxmissio.c index decda3a12f3..9bc06af43a7 100644 --- a/src/mame/video/xxmissio.c +++ b/src/mame/video/xxmissio.c @@ -147,7 +147,7 @@ VIDEO_UPDATE( xxmissio ) tilemap_set_scrolly(bg_tilemap, 0, yscroll); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(bitmap, machine->gfx, cliprect); + draw_sprites(bitmap, screen->machine->gfx, cliprect); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); return 0; diff --git a/src/mame/video/xybots.c b/src/mame/video/xybots.c index f9beb683b4b..82a982b2605 100644 --- a/src/mame/video/xybots.c +++ b/src/mame/video/xybots.c @@ -110,7 +110,7 @@ VIDEO_UPDATE( xybots ) tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); /* draw and merge the MO */ - mobitmap = atarimo_render(machine, 0, cliprect, &rectlist); + mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) { diff --git a/src/mame/video/ygv608.c b/src/mame/video/ygv608.c index ca4e90ce798..083425a6d23 100644 --- a/src/mame/video/ygv608.c +++ b/src/mame/video/ygv608.c @@ -746,9 +746,9 @@ VIDEO_UPDATE( ygv608 ) // clip to the current bitmap finalclip.min_x = 0; - finalclip.max_x = machine->screen[0].width - 1; + finalclip.max_x = screen->machine->screen[0].width - 1; finalclip.min_y = 0; - finalclip.max_y = machine->screen[0].height - 1; + finalclip.max_y = screen->machine->screen[0].height - 1; sect_rect(&finalclip, cliprect); cliprect = &finalclip; @@ -770,8 +770,8 @@ VIDEO_UPDATE( ygv608 ) if( work_bitmap ) bitmap_free( work_bitmap ); - work_bitmap = bitmap_alloc( machine->screen[0].width, - machine->screen[0].height, machine->screen[0].format ); + work_bitmap = bitmap_alloc( screen->machine->screen[0].width, + screen->machine->screen[0].height, screen->machine->screen[0].format ); // reset resize flag ygv608.screen_resize = 0; @@ -884,10 +884,10 @@ VIDEO_UPDATE( ygv608 ) if( ygv608.regs.s.zron ) copyrozbitmap( bitmap, work_bitmap, - ( machine->screen[0].visarea.min_x << 16 ) + + ( screen->machine->screen[0].visarea.min_x << 16 ) + ygv608.ax + 0x10000 * r * ( -sin( alpha ) * cos_theta + cos( alpha ) * sin_theta ), - ( machine->screen[0].visarea.min_y << 16 ) + + ( screen->machine->screen[0].visarea.min_y << 16 ) + ygv608.ay + 0x10000 * r * ( cos( alpha ) * cos_theta + sin( alpha ) * sin_theta ), ygv608.dx, ygv608.dxy, ygv608.dyx, ygv608.dy, 0, @@ -900,11 +900,11 @@ VIDEO_UPDATE( ygv608 ) // for some reason we can't use an opaque tilemap_A // so use a transparent but clear the work bitmap first // - look at why this is the case?!? - fillbitmap( work_bitmap,0,&machine->screen[0].visarea ); + fillbitmap( work_bitmap,0,&screen->machine->screen[0].visarea ); if ((ygv608.regs.s.r11 & r11_prm) == PRM_ASBDEX || (ygv608.regs.s.r11 & r11_prm) == PRM_ASEBDX ) - draw_sprites(machine, bitmap,cliprect ); + draw_sprites(screen->machine, bitmap,cliprect ); tilemap_draw( work_bitmap,cliprect, tilemap_A, 0, 0 ); @@ -922,7 +922,7 @@ VIDEO_UPDATE( ygv608 ) if ((ygv608.regs.s.r11 & r11_prm) == PRM_SABDEX || (ygv608.regs.s.r11 & r11_prm) == PRM_SEABDX) - draw_sprites(machine, bitmap,cliprect ); + draw_sprites(screen->machine, bitmap,cliprect ); #ifdef _SHOW_VIDEO_DEBUG diff --git a/src/mame/video/yiear.c b/src/mame/video/yiear.c index 58ed12a9438..4aacd9ee527 100644 --- a/src/mame/video/yiear.c +++ b/src/mame/video/yiear.c @@ -145,6 +145,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( yiear ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } diff --git a/src/mame/video/yunsun16.c b/src/mame/video/yunsun16.c index e927fd48505..98efd68a5d3 100644 --- a/src/mame/video/yunsun16.c +++ b/src/mame/video/yunsun16.c @@ -217,21 +217,17 @@ VIDEO_UPDATE( yunsun16 ) { /* The color of the this layer's transparent pen goes below everything */ tilemap_draw(bitmap,cliprect,tilemap_0, TILEMAP_DRAW_OPAQUE, 0); - tilemap_draw(bitmap,cliprect,tilemap_0, 0, 1); - tilemap_draw(bitmap,cliprect,tilemap_1, 0, 2); } else if((*yunsun16_priority & 0x0c) == 8) { /* The color of the this layer's transparent pen goes below everything */ tilemap_draw(bitmap,cliprect,tilemap_1, TILEMAP_DRAW_OPAQUE, 0); - tilemap_draw(bitmap,cliprect,tilemap_1, 0, 1); - tilemap_draw(bitmap,cliprect,tilemap_0, 0, 2); } - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/zac2650.c b/src/mame/video/zac2650.c index ccd708f26ad..7f983f61264 100644 --- a/src/mame/video/zac2650.c +++ b/src/mame/video/zac2650.c @@ -224,6 +224,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap) VIDEO_UPDATE( tinvader ) { tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); - draw_sprites(machine, bitmap); + draw_sprites(screen->machine, bitmap); return 0; } diff --git a/src/mame/video/zaccaria.c b/src/mame/video/zaccaria.c index c8e64835033..1957051371e 100644 --- a/src/mame/video/zaccaria.c +++ b/src/mame/video/zaccaria.c @@ -285,7 +285,6 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( zaccaria ) { tilemap_draw(bitmap,cliprect,bg_tilemap,0,0); - - draw_sprites(machine, bitmap,cliprect); + draw_sprites(screen->machine, bitmap,cliprect); return 0; } diff --git a/src/mame/video/zaxxon.c b/src/mame/video/zaxxon.c index 018b56d19e5..7dff8a48932 100644 --- a/src/mame/video/zaxxon.c +++ b/src/mame/video/zaxxon.c @@ -453,8 +453,8 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( zaxxon ) { - draw_background(machine, bitmap, cliprect, TRUE); - draw_sprites(machine, bitmap, cliprect, 0x140, 0x180); + draw_background(screen->machine, bitmap, cliprect, TRUE); + draw_sprites(screen->machine, bitmap, cliprect, 0x140, 0x180); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); return 0; } @@ -462,8 +462,8 @@ VIDEO_UPDATE( zaxxon ) VIDEO_UPDATE( futspy ) { - draw_background(machine, bitmap, cliprect, TRUE); - draw_sprites(machine, bitmap, cliprect, 0x180, 0x180); + draw_background(screen->machine, bitmap, cliprect, TRUE); + draw_sprites(screen->machine, bitmap, cliprect, 0x180, 0x180); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); return 0; } @@ -471,8 +471,8 @@ VIDEO_UPDATE( futspy ) VIDEO_UPDATE( razmataz ) { - draw_background(machine, bitmap, cliprect, FALSE); - draw_sprites(machine, bitmap, cliprect, 0x140, 0x180); + draw_background(screen->machine, bitmap, cliprect, FALSE); + draw_sprites(screen->machine, bitmap, cliprect, 0x140, 0x180); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); return 0; } @@ -480,8 +480,8 @@ VIDEO_UPDATE( razmataz ) VIDEO_UPDATE( congo ) { - draw_background(machine, bitmap, cliprect, TRUE); - draw_sprites(machine, bitmap, cliprect, 0x280, 0x180); + draw_background(screen->machine, bitmap, cliprect, TRUE); + draw_sprites(screen->machine, bitmap, cliprect, 0x280, 0x180); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/zodiack.c b/src/mame/video/zodiack.c index cadb0f94206..c2c061b69ca 100644 --- a/src/mame/video/zodiack.c +++ b/src/mame/video/zodiack.c @@ -201,7 +201,7 @@ VIDEO_UPDATE( zodiack ) tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0); - draw_bullets(machine, bitmap, cliprect); - draw_sprites(machine, bitmap, cliprect); + draw_bullets(screen->machine, bitmap, cliprect); + draw_sprites(screen->machine, bitmap, cliprect); return 0; } |