diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2012-09-17 15:00:31 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2012-09-17 15:00:31 +0000 |
commit | 5ddbca3e7a2327786fd92cc7443dd84257ba889a (patch) | |
tree | f6eb4b827714a8658ea246336342b03d6d7938e0 /src/mame/includes | |
parent | f27b07d0822f4ff52b95a1a0143f3c2313ea02ce (diff) |
Modernized screen update calls (no whatsnew)
Diffstat (limited to 'src/mame/includes')
630 files changed, 2101 insertions, 1024 deletions
diff --git a/src/mame/includes/1942.h b/src/mame/includes/1942.h index 4e7735743e1..11f1504594d 100644 --- a/src/mame/includes/1942.h +++ b/src/mame/includes/1942.h @@ -39,6 +39,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_1942(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/1943.h b/src/mame/includes/1943.h index 86e16c5e803..3485cfb1f0c 100644 --- a/src/mame/includes/1943.h +++ b/src/mame/includes/1943.h @@ -46,6 +46,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_1943(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/20pacgal.h b/src/mame/includes/20pacgal.h index 6c8439af996..69a7e3c6607 100644 --- a/src/mame/includes/20pacgal.h +++ b/src/mame/includes/20pacgal.h @@ -54,6 +54,7 @@ public: DECLARE_DRIVER_INIT(20pacgal); virtual void machine_start(); virtual void machine_reset(); + UINT32 screen_update_20pacgal(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/3do.h b/src/mame/includes/3do.h index 2de54ca28e0..779e9afdefd 100644 --- a/src/mame/includes/3do.h +++ b/src/mame/includes/3do.h @@ -187,6 +187,7 @@ public: DECLARE_WRITE32_MEMBER(_3do_clio_w); virtual void machine_reset(); DECLARE_VIDEO_START(_3do); + UINT32 screen_update__3do(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in machine/3do.c -----------*/ @@ -201,6 +202,6 @@ void _3do_clio_init( running_machine &machine, screen_device *screen ); -SCREEN_UPDATE_RGB32( _3do ); + #endif /* _3DO_H_ */ diff --git a/src/mame/includes/40love.h b/src/mame/includes/40love.h index 9d455cdec4d..80a1f8e2a7f 100644 --- a/src/mame/includes/40love.h +++ b/src/mame/includes/40love.h @@ -95,6 +95,7 @@ public: DECLARE_MACHINE_RESET(undoukai); DECLARE_MACHINE_RESET(common); DECLARE_MACHINE_RESET(ta7630); + UINT32 screen_update_fortyl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -102,5 +103,5 @@ public: -SCREEN_UPDATE_IND16( fortyl ); + diff --git a/src/mame/includes/4enraya.h b/src/mame/includes/4enraya.h index d4303f2c4ff..022e9d996f2 100644 --- a/src/mame/includes/4enraya.h +++ b/src/mame/includes/4enraya.h @@ -34,6 +34,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_4enraya(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -41,4 +42,4 @@ public: -SCREEN_UPDATE_IND16( 4enraya ); + diff --git a/src/mame/includes/8080bw.h b/src/mame/includes/8080bw.h index 86b53b6f48d..a44479d4db1 100644 --- a/src/mame/includes/8080bw.h +++ b/src/mame/includes/8080bw.h @@ -74,6 +74,17 @@ public: DECLARE_MACHINE_START(extra_8080bw_vh); DECLARE_MACHINE_START(schaser_sh); DECLARE_MACHINE_RESET(schaser_sh); + UINT32 screen_update_invadpt2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_cosmo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_rollingc(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_schaser(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_schasercv(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_sflush(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_indianbt(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_lupin3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_polaris(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_ballbomb(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_shuttlei(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -101,15 +112,15 @@ DISCRETE_SOUND_EXTERN( schaser ); -SCREEN_UPDATE_RGB32( invadpt2 ); -SCREEN_UPDATE_RGB32( ballbomb ); -SCREEN_UPDATE_RGB32( schaser ); -SCREEN_UPDATE_RGB32( schasercv ); -SCREEN_UPDATE_RGB32( rollingc ); -SCREEN_UPDATE_RGB32( polaris ); -SCREEN_UPDATE_RGB32( lupin3 ); -SCREEN_UPDATE_RGB32( cosmo ); -SCREEN_UPDATE_RGB32( indianbt ); -SCREEN_UPDATE_RGB32( shuttlei ); -SCREEN_UPDATE_RGB32( sflush ); + + + + + + + + + + + diff --git a/src/mame/includes/88games.h b/src/mame/includes/88games.h index 2e21faee9cf..a51a91fa767 100644 --- a/src/mame/includes/88games.h +++ b/src/mame/includes/88games.h @@ -46,6 +46,7 @@ public: DECLARE_WRITE8_MEMBER(k052109_051960_w); virtual void machine_start(); virtual void machine_reset(); + UINT32 screen_update_88games(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -55,4 +56,4 @@ void _88games_sprite_callback(running_machine &machine, int *code, int *color, i void _88games_tile_callback(running_machine &machine, int layer, int bank, int *code, int *color, int *flags, int *priority); void _88games_zoom_callback(running_machine &machine, int *code, int *color, int *flags); -SCREEN_UPDATE_IND16( 88games ); + diff --git a/src/mame/includes/actfancr.h b/src/mame/includes/actfancr.h index 6d361082eea..ad090581aba 100644 --- a/src/mame/includes/actfancr.h +++ b/src/mame/includes/actfancr.h @@ -33,6 +33,7 @@ public: DECLARE_MACHINE_RESET(actfancr); DECLARE_MACHINE_START(triothep); DECLARE_MACHINE_RESET(triothep); + UINT32 screen_update_actfancr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -46,5 +47,5 @@ DECLARE_READ8_HANDLER( actfancr_pf2_data_r ); DECLARE_WRITE8_HANDLER( actfancr_pf2_control_w ); -SCREEN_UPDATE_IND16( actfancr ); + diff --git a/src/mame/includes/aeroboto.h b/src/mame/includes/aeroboto.h index 389e3da57e6..d6bc2171937 100644 --- a/src/mame/includes/aeroboto.h +++ b/src/mame/includes/aeroboto.h @@ -58,11 +58,12 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_aeroboto(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/aeroboto.c -----------*/ -SCREEN_UPDATE_IND16( aeroboto ); + diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h index 8f7278dd5ae..f715c396f09 100644 --- a/src/mame/includes/aerofgt.h +++ b/src/mame/includes/aerofgt.h @@ -83,6 +83,16 @@ public: DECLARE_VIDEO_START(spinlbrk); DECLARE_VIDEO_START(turbofrc); DECLARE_VIDEO_START(wbbc97); + UINT32 screen_update_pspikes(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_spikes91(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_pspikesb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_karatblz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_spinlbrk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_turbofrc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_aerofgt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_aerfboot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_aerfboo2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_wbbc97(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -95,13 +105,13 @@ public: -SCREEN_UPDATE_IND16( pspikes ); -SCREEN_UPDATE_IND16( pspikesb ); -SCREEN_UPDATE_IND16( spikes91 ); -SCREEN_UPDATE_IND16( karatblz ); -SCREEN_UPDATE_IND16( spinlbrk ); -SCREEN_UPDATE_IND16( turbofrc ); -SCREEN_UPDATE_IND16( aerofgt ); -SCREEN_UPDATE_IND16( aerfboot ); -SCREEN_UPDATE_IND16( aerfboo2 ); -SCREEN_UPDATE_RGB32( wbbc97 ); + + + + + + + + + + diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h index bd5776ab0d5..942a2e7502e 100644 --- a/src/mame/includes/airbustr.h +++ b/src/mame/includes/airbustr.h @@ -66,6 +66,8 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_airbustr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_airbustr(screen_device &screen, bool state); }; @@ -73,5 +75,5 @@ public: -SCREEN_UPDATE_IND16( airbustr ); -SCREEN_VBLANK( airbustr ); + + diff --git a/src/mame/includes/ajax.h b/src/mame/includes/ajax.h index 32022c6d9b9..1222ec3c0af 100644 --- a/src/mame/includes/ajax.h +++ b/src/mame/includes/ajax.h @@ -36,6 +36,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_ajax(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -48,7 +49,7 @@ INTERRUPT_GEN( ajax_interrupt ); /*----------- defined in video/ajax.c -----------*/ -SCREEN_UPDATE_IND16( ajax ); + extern void ajax_tile_callback(running_machine &machine, int layer,int bank,int *code,int *color,int *flags,int *priority); extern void ajax_sprite_callback(running_machine &machine, int *code,int *color,int *priority,int *shadow); diff --git a/src/mame/includes/aliens.h b/src/mame/includes/aliens.h index f15d7badd33..28b958a6737 100644 --- a/src/mame/includes/aliens.h +++ b/src/mame/includes/aliens.h @@ -38,6 +38,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_aliens(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/aliens.c -----------*/ @@ -46,4 +47,4 @@ extern void aliens_tile_callback(running_machine &machine, int layer,int bank,in extern void aliens_sprite_callback(running_machine &machine, int *code,int *color,int *priority_mask,int *shadow); -SCREEN_UPDATE_IND16( aliens ); + diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h index 179913aa331..3fbd9d63507 100644 --- a/src/mame/includes/alpha68k.h +++ b/src/mame/includes/alpha68k.h @@ -98,6 +98,12 @@ public: DECLARE_VIDEO_START(alpha68k); DECLARE_MACHINE_START(alpha68k_V); DECLARE_MACHINE_RESET(alpha68k_V); + UINT32 screen_update_sstingry(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_kyros(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_alpha68k_I(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_alpha68k_II(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_alpha68k_V(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_alpha68k_V_sb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /* game_id - used to deal with a few game specific situations */ @@ -116,12 +122,12 @@ enum -SCREEN_UPDATE_IND16( kyros ); -SCREEN_UPDATE_IND16( sstingry ); -SCREEN_UPDATE_IND16( alpha68k_I ); -SCREEN_UPDATE_IND16( alpha68k_II ); -SCREEN_UPDATE_IND16( alpha68k_V ); -SCREEN_UPDATE_IND16( alpha68k_V_sb ); + + + + + + void alpha68k_V_video_bank_w(running_machine &machine, int bank); void alpha68k_flipscreen_w(running_machine &machine, int flip); diff --git a/src/mame/includes/ambush.h b/src/mame/includes/ambush.h index b61ebc8ab57..31b340f3964 100644 --- a/src/mame/includes/ambush.h +++ b/src/mame/includes/ambush.h @@ -25,10 +25,11 @@ public: DECLARE_WRITE8_MEMBER(ambush_coin_counter_w); DECLARE_WRITE8_MEMBER(flip_screen_w); virtual void palette_init(); + UINT32 screen_update_ambush(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/ambush.c -----------*/ -SCREEN_UPDATE_IND16( ambush ); + diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h index 9e2c0f2cefc..b2805185a69 100644 --- a/src/mame/includes/amiga.h +++ b/src/mame/includes/amiga.h @@ -434,6 +434,8 @@ public: DECLARE_VIDEO_START(amiga); DECLARE_PALETTE_INIT(amiga); DECLARE_VIDEO_START(amiga_aga); + UINT32 screen_update_amiga(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_amiga_aga(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -502,7 +504,7 @@ extern const UINT16 amiga_expand_byte[256]; -SCREEN_UPDATE_IND16( amiga ); + void amiga_copper_setpc(running_machine &machine, UINT32 pc); int amiga_copper_execute_next(running_machine &machine, int xpos); @@ -516,7 +518,7 @@ void amiga_sprite_enable_comparitor(running_machine &machine, int which, int ena /*----------- defined in video/amigaaga.c -----------*/ -SCREEN_UPDATE_RGB32( amiga_aga ); + void amiga_aga_render_scanline(running_machine &machine, bitmap_rgb32 &bitmap, int scanline); void amiga_aga_palette_write(running_machine &machine, int color_reg, UINT16 data); diff --git a/src/mame/includes/ampoker2.h b/src/mame/includes/ampoker2.h index f5a80a8cf00..f2443728b39 100644 --- a/src/mame/includes/ampoker2.h +++ b/src/mame/includes/ampoker2.h @@ -23,6 +23,7 @@ public: virtual void video_start(); virtual void palette_init(); DECLARE_VIDEO_START(sigma2k); + UINT32 screen_update_ampoker2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -31,4 +32,4 @@ public: -SCREEN_UPDATE_IND16( ampoker2 ); + diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h index a65890127da..f18a5e070b3 100644 --- a/src/mame/includes/amspdwy.h +++ b/src/mame/includes/amspdwy.h @@ -43,6 +43,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_amspdwy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -50,4 +51,4 @@ public: -SCREEN_UPDATE_IND16( amspdwy ); + diff --git a/src/mame/includes/angelkds.h b/src/mame/includes/angelkds.h index c60aff1f91d..12cd9ea40d2 100644 --- a/src/mame/includes/angelkds.h +++ b/src/mame/includes/angelkds.h @@ -59,6 +59,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_angelkds(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -68,4 +69,4 @@ public: -SCREEN_UPDATE_IND16( angelkds ); + diff --git a/src/mame/includes/appoooh.h b/src/mame/includes/appoooh.h index 7b040ec841a..1133040f8f7 100644 --- a/src/mame/includes/appoooh.h +++ b/src/mame/includes/appoooh.h @@ -50,6 +50,8 @@ public: DECLARE_VIDEO_START(appoooh); DECLARE_PALETTE_INIT(appoooh); DECLARE_PALETTE_INIT(robowres); + UINT32 screen_update_appoooh(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_robowres(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; #define CHR1_OFST 0x00 /* palette page of char set #1 */ @@ -61,5 +63,5 @@ public: -SCREEN_UPDATE_IND16( appoooh ); -SCREEN_UPDATE_IND16( robowres ); + + diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h index 9594e37f92c..5a063423a92 100644 --- a/src/mame/includes/aquarium.h +++ b/src/mame/includes/aquarium.h @@ -46,6 +46,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_aquarium(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -53,4 +54,4 @@ public: -SCREEN_UPDATE_IND16(aquarium); + diff --git a/src/mame/includes/arabian.h b/src/mame/includes/arabian.h index 39427f2b9f5..9348737aa77 100644 --- a/src/mame/includes/arabian.h +++ b/src/mame/includes/arabian.h @@ -42,6 +42,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_arabian(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -50,4 +51,4 @@ public: -SCREEN_UPDATE_IND16( arabian ); + diff --git a/src/mame/includes/arcadecl.h b/src/mame/includes/arcadecl.h index a2f3cd9044e..e6e37ad8ed5 100644 --- a/src/mame/includes/arcadecl.h +++ b/src/mame/includes/arcadecl.h @@ -21,9 +21,10 @@ public: DECLARE_MACHINE_START(arcadecl); DECLARE_MACHINE_RESET(arcadecl); DECLARE_VIDEO_START(arcadecl); + UINT32 screen_update_arcadecl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/arcadecl.c -----------*/ -SCREEN_UPDATE_IND16( arcadecl ); + diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h index 778c60fd280..f8b981042ce 100644 --- a/src/mame/includes/argus.h +++ b/src/mame/includes/argus.h @@ -80,6 +80,9 @@ public: DECLARE_VIDEO_RESET(valtric); DECLARE_VIDEO_START(butasan); DECLARE_VIDEO_RESET(butasan); + UINT32 screen_update_argus(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_valtric(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_butasan(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -91,9 +94,9 @@ public: -SCREEN_UPDATE_RGB32( argus ); -SCREEN_UPDATE_RGB32( valtric ); -SCREEN_UPDATE_RGB32( butasan ); + + + diff --git a/src/mame/includes/arkanoid.h b/src/mame/includes/arkanoid.h index d6823e81342..3945422ecba 100644 --- a/src/mame/includes/arkanoid.h +++ b/src/mame/includes/arkanoid.h @@ -77,6 +77,8 @@ public: DECLARE_MACHINE_START(arkanoid); DECLARE_MACHINE_RESET(arkanoid); DECLARE_VIDEO_START(arkanoid); + UINT32 screen_update_arkanoid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_hexa(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h index 4edf87ae762..41e6e5de703 100644 --- a/src/mame/includes/armedf.h +++ b/src/mame/includes/armedf.h @@ -79,6 +79,7 @@ public: DECLARE_MACHINE_RESET(armedf); DECLARE_VIDEO_START(terraf); DECLARE_VIDEO_START(armedf); + UINT32 screen_update_armedf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; class bigfghtr_state : public armedf_state @@ -105,7 +106,7 @@ public: /*----------- defined in video/armedf.c -----------*/ -SCREEN_UPDATE_IND16( armedf ); + diff --git a/src/mame/includes/ashnojoe.h b/src/mame/includes/ashnojoe.h index 32f0b02ea77..1831acc5f62 100644 --- a/src/mame/includes/ashnojoe.h +++ b/src/mame/includes/ashnojoe.h @@ -73,6 +73,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_ashnojoe(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -80,4 +81,4 @@ public: -SCREEN_UPDATE_IND16( ashnojoe ); + diff --git a/src/mame/includes/asterix.h b/src/mame/includes/asterix.h index 995fefb9af2..36941921f71 100644 --- a/src/mame/includes/asterix.h +++ b/src/mame/includes/asterix.h @@ -42,13 +42,14 @@ public: DECLARE_DRIVER_INIT(asterix); virtual void machine_start(); virtual void machine_reset(); + UINT32 screen_update_asterix(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/asterix.c -----------*/ -SCREEN_UPDATE_IND16( asterix ); + extern void asterix_tile_callback(running_machine &machine, int layer, int *code, int *color, int *flags); extern void asterix_sprite_callback(running_machine &machine, int *code, int *color, int *priority_mask); diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h index df8269a84ee..aca21100990 100644 --- a/src/mame/includes/astrocde.h +++ b/src/mame/includes/astrocde.h @@ -120,6 +120,8 @@ public: virtual void palette_init(); DECLARE_VIDEO_START(profpac); DECLARE_PALETTE_INIT(profpac); + UINT32 screen_update_astrocde(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_profpac(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -131,8 +133,8 @@ public: -SCREEN_UPDATE_IND16( astrocde ); -SCREEN_UPDATE_IND16( profpac ); + + diff --git a/src/mame/includes/astrof.h b/src/mame/includes/astrof.h index e2c6134eb26..dfd441d5e74 100644 --- a/src/mame/includes/astrof.h +++ b/src/mame/includes/astrof.h @@ -68,6 +68,8 @@ public: DECLARE_MACHINE_RESET(abattle); DECLARE_MACHINE_START(spfghmk2); DECLARE_MACHINE_START(tomahawk); + UINT32 screen_update_astrof(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_tomahawk(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in audio/astrof.c -----------*/ diff --git a/src/mame/includes/asuka.h b/src/mame/includes/asuka.h index 1fc5c834290..c2441e4f3b0 100644 --- a/src/mame/includes/asuka.h +++ b/src/mame/includes/asuka.h @@ -47,6 +47,9 @@ public: DECLARE_WRITE8_MEMBER(asuka_msm5205_stop_w); virtual void machine_start(); virtual void machine_reset(); + UINT32 screen_update_bonzeadv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_asuka(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_asuka(screen_device &screen, bool state); }; @@ -63,5 +66,5 @@ DECLARE_WRITE16_HANDLER( bonzeadv_cchip_ram_w ); /*----------- defined in video/asuka.c -----------*/ -SCREEN_UPDATE_IND16( asuka ); -SCREEN_UPDATE_IND16( bonzeadv ); + + diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h index dbcd15e78d1..77a76272037 100644 --- a/src/mame/includes/atarifb.h +++ b/src/mame/includes/atarifb.h @@ -79,6 +79,9 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_atarifb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_abaseb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_soccer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -98,7 +101,7 @@ DISCRETE_SOUND_EXTERN( abaseb ); /*----------- defined in video/atarifb.c -----------*/ -SCREEN_UPDATE_IND16( atarifb ); -SCREEN_UPDATE_IND16( abaseb ); -SCREEN_UPDATE_IND16( soccer ); + + + diff --git a/src/mame/includes/atarig1.h b/src/mame/includes/atarig1.h index 46f161d813d..42fdd37572f 100644 --- a/src/mame/includes/atarig1.h +++ b/src/mame/includes/atarig1.h @@ -49,6 +49,8 @@ public: DECLARE_MACHINE_START(atarig1); DECLARE_MACHINE_RESET(atarig1); DECLARE_VIDEO_START(atarig1); + UINT32 screen_update_atarig1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_atarig1(screen_device &screen, bool state); }; @@ -56,7 +58,7 @@ public: -SCREEN_VBLANK( atarig1 ); -SCREEN_UPDATE_IND16( atarig1 ); + + void atarig1_scanline_update(screen_device &screen, int scanline); diff --git a/src/mame/includes/atarig42.h b/src/mame/includes/atarig42.h index 86064464201..42efda023d8 100644 --- a/src/mame/includes/atarig42.h +++ b/src/mame/includes/atarig42.h @@ -52,14 +52,16 @@ public: DECLARE_MACHINE_START(atarig42); DECLARE_MACHINE_RESET(atarig42); DECLARE_VIDEO_START(atarig42); + UINT32 screen_update_atarig42(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_atarig42(screen_device &screen, bool state); }; /*----------- defined in video/atarig42.c -----------*/ -SCREEN_VBLANK( atarig42 ); -SCREEN_UPDATE_IND16( atarig42 ); + + DECLARE_WRITE16_HANDLER( atarig42_mo_control_w ); diff --git a/src/mame/includes/atarigt.h b/src/mame/includes/atarigt.h index 36bf17c7cde..25a28a97dae 100644 --- a/src/mame/includes/atarigt.h +++ b/src/mame/includes/atarigt.h @@ -71,6 +71,8 @@ public: DECLARE_MACHINE_START(atarigt); DECLARE_MACHINE_RESET(atarigt); DECLARE_VIDEO_START(atarigt); + UINT32 screen_update_atarigt(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void screen_eof_atarigt(screen_device &screen, bool state); }; @@ -79,7 +81,7 @@ public: -SCREEN_VBLANK( atarigt ); -SCREEN_UPDATE_RGB32( atarigt ); + + void atarigt_scanline_update(screen_device &screen, int scanline); diff --git a/src/mame/includes/atarigx2.h b/src/mame/includes/atarigx2.h index f473fbb7d1f..72932fb56d2 100644 --- a/src/mame/includes/atarigx2.h +++ b/src/mame/includes/atarigx2.h @@ -46,14 +46,16 @@ public: DECLARE_MACHINE_START(atarigx2); DECLARE_MACHINE_RESET(atarigx2); DECLARE_VIDEO_START(atarigx2); + UINT32 screen_update_atarigx2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_atarigx2(screen_device &screen, bool state); }; /*----------- defined in video/atarigx2.c -----------*/ -SCREEN_VBLANK( atarigx2 ); -SCREEN_UPDATE_IND16( atarigx2 ); + + DECLARE_WRITE16_HANDLER( atarigx2_mo_control_w ); diff --git a/src/mame/includes/atarisy1.h b/src/mame/includes/atarisy1.h index fa644ce7711..a422a825622 100644 --- a/src/mame/includes/atarisy1.h +++ b/src/mame/includes/atarisy1.h @@ -64,6 +64,7 @@ public: DECLARE_MACHINE_START(atarisy1); DECLARE_MACHINE_RESET(atarisy1); DECLARE_VIDEO_START(atarisy1); + UINT32 screen_update_atarisy1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -82,4 +83,4 @@ DECLARE_WRITE16_HANDLER( atarisy1_yscroll_w ); DECLARE_WRITE16_HANDLER( atarisy1_priority_w ); -SCREEN_UPDATE_IND16( atarisy1 ); + diff --git a/src/mame/includes/atarisy2.h b/src/mame/includes/atarisy2.h index 10777b7c715..e8ddb4e7edc 100644 --- a/src/mame/includes/atarisy2.h +++ b/src/mame/includes/atarisy2.h @@ -78,6 +78,7 @@ public: DECLARE_MACHINE_START(atarisy2); DECLARE_MACHINE_RESET(atarisy2); DECLARE_VIDEO_START(atarisy2); + UINT32 screen_update_atarisy2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -93,4 +94,4 @@ DECLARE_WRITE16_HANDLER( atarisy2_videoram_w ); DECLARE_WRITE16_HANDLER( atarisy2_paletteram_w ); -SCREEN_UPDATE_IND16( atarisy2 ); + diff --git a/src/mame/includes/atetris.h b/src/mame/includes/atetris.h index 1b7eb93ff7a..1a910c27386 100644 --- a/src/mame/includes/atetris.h +++ b/src/mame/includes/atetris.h @@ -31,10 +31,11 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_atetris(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/atetris.c -----------*/ -SCREEN_UPDATE_IND16( atetris ); + diff --git a/src/mame/includes/avalnche.h b/src/mame/includes/avalnche.h index 74aaa2c3feb..88a8d79b377 100644 --- a/src/mame/includes/avalnche.h +++ b/src/mame/includes/avalnche.h @@ -25,6 +25,7 @@ public: DECLARE_WRITE8_MEMBER(avalance_start_lamp_w); virtual void machine_start(); virtual void machine_reset(); + UINT32 screen_update_avalnche(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in audio/avalnche.c -----------*/ diff --git a/src/mame/includes/badlands.h b/src/mame/includes/badlands.h index 956baa663f8..d390772c0fe 100644 --- a/src/mame/includes/badlands.h +++ b/src/mame/includes/badlands.h @@ -30,6 +30,7 @@ public: DECLARE_MACHINE_RESET(badlands); DECLARE_VIDEO_START(badlands); DECLARE_MACHINE_RESET(badlandsb); + UINT32 screen_update_badlands(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -38,4 +39,4 @@ public: DECLARE_WRITE16_HANDLER( badlands_pf_bank_w ); -SCREEN_UPDATE_IND16( badlands ); + diff --git a/src/mame/includes/bagman.h b/src/mame/includes/bagman.h index c0727672f9b..e3467434071 100644 --- a/src/mame/includes/bagman.h +++ b/src/mame/includes/bagman.h @@ -47,6 +47,7 @@ public: DECLARE_MACHINE_RESET(bagman); DECLARE_VIDEO_START(bagman); DECLARE_PALETTE_INIT(bagman); + UINT32 screen_update_bagman(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -80,4 +81,4 @@ public: -SCREEN_UPDATE_IND16( bagman ); + diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h index f93c866dd62..0af442604de 100644 --- a/src/mame/includes/balsente.h +++ b/src/mame/includes/balsente.h @@ -192,6 +192,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_balsente(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -224,5 +225,5 @@ TIMER_DEVICE_CALLBACK( balsente_clock_counter_0_ff ); /*----------- defined in video/balsente.c -----------*/ -SCREEN_UPDATE_IND16( balsente ); + diff --git a/src/mame/includes/bankp.h b/src/mame/includes/bankp.h index 89508da3797..728917636ea 100644 --- a/src/mame/includes/bankp.h +++ b/src/mame/includes/bankp.h @@ -38,6 +38,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_bankp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -46,6 +47,6 @@ public: -SCREEN_UPDATE_IND16( bankp ); + diff --git a/src/mame/includes/baraduke.h b/src/mame/includes/baraduke.h index a43c30335ef..bdeed1af1e2 100644 --- a/src/mame/includes/baraduke.h +++ b/src/mame/includes/baraduke.h @@ -38,12 +38,14 @@ public: TILE_GET_INFO_MEMBER(get_tile_info1); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_baraduke(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_baraduke(screen_device &screen, bool state); }; /*----------- defined in video/baraduke.c -----------*/ -SCREEN_UPDATE_IND16( baraduke ); -SCREEN_VBLANK( baraduke ); + + diff --git a/src/mame/includes/batman.h b/src/mame/includes/batman.h index aa8cfe9e423..d0e6f8f90fe 100644 --- a/src/mame/includes/batman.h +++ b/src/mame/includes/batman.h @@ -26,12 +26,13 @@ public: DECLARE_MACHINE_START(batman); DECLARE_MACHINE_RESET(batman); DECLARE_VIDEO_START(batman); + UINT32 screen_update_batman(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/batman.c -----------*/ -SCREEN_UPDATE_IND16( batman ); + void batman_scanline_update(screen_device &screen, int scanline); diff --git a/src/mame/includes/battlane.h b/src/mame/includes/battlane.h index 5510fa98e01..c656ba661cb 100644 --- a/src/mame/includes/battlane.h +++ b/src/mame/includes/battlane.h @@ -38,6 +38,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_battlane(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -45,4 +46,4 @@ public: -SCREEN_UPDATE_IND16( battlane ); + diff --git a/src/mame/includes/battlera.h b/src/mame/includes/battlera.h index 4421c3e290d..0401e3e28ef 100644 --- a/src/mame/includes/battlera.h +++ b/src/mame/includes/battlera.h @@ -40,12 +40,13 @@ public: DECLARE_WRITE8_MEMBER(HuC6270_data_w); DECLARE_WRITE8_MEMBER(battlera_adpcm_reset_w); virtual void video_start(); + UINT32 screen_update_battlera(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/battlera.c -----------*/ -SCREEN_UPDATE_IND16( battlera ); + TIMER_DEVICE_CALLBACK( battlera_irq ); diff --git a/src/mame/includes/battlex.h b/src/mame/includes/battlex.h index d6c7479cd6c..e80705bb734 100644 --- a/src/mame/includes/battlex.h +++ b/src/mame/includes/battlex.h @@ -35,6 +35,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_battlex(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/battlnts.h b/src/mame/includes/battlnts.h index ebb30af1d28..c11e5c339c0 100644 --- a/src/mame/includes/battlnts.h +++ b/src/mame/includes/battlnts.h @@ -28,12 +28,13 @@ public: DECLARE_DRIVER_INIT(rackemup); virtual void machine_start(); virtual void machine_reset(); + UINT32 screen_update_battlnts(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/battlnts.c -----------*/ -SCREEN_UPDATE_IND16( battlnts ); + void battlnts_tile_callback(running_machine &machine, int layer, int bank, int *code, int *color, int *flags); void battlnts_sprite_callback(running_machine &machine, int *code, int *color); diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h index 98a452842ff..cd9aab0b0af 100644 --- a/src/mame/includes/bbusters.h +++ b/src/mame/includes/bbusters.h @@ -54,6 +54,9 @@ public: TILE_GET_INFO_MEMBER(get_pf2_tile_info); DECLARE_VIDEO_START(bbuster); DECLARE_VIDEO_START(mechatt); + UINT32 screen_update_bbuster(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_mechatt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_bbuster(screen_device &screen, bool state); }; @@ -61,6 +64,6 @@ public: -SCREEN_UPDATE_IND16( bbuster ); -SCREEN_UPDATE_IND16( mechatt ); + + diff --git a/src/mame/includes/beezer.h b/src/mame/includes/beezer.h index 04a0b9aa735..336fdbb139f 100644 --- a/src/mame/includes/beezer.h +++ b/src/mame/includes/beezer.h @@ -17,6 +17,7 @@ public: DECLARE_READ8_MEMBER(beezer_line_r); DECLARE_DRIVER_INIT(beezer); virtual void machine_start(); + UINT32 screen_update_beezer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -62,4 +63,4 @@ DECLARE_READ8_DEVICE_HANDLER( beezer_noise_r ); /*----------- defined in video/beezer.c -----------*/ TIMER_DEVICE_CALLBACK( beezer_interrupt ); -SCREEN_UPDATE_IND16( beezer ); + diff --git a/src/mame/includes/bigevglf.h b/src/mame/includes/bigevglf.h index a951cb9d68d..2d7d7fa954b 100644 --- a/src/mame/includes/bigevglf.h +++ b/src/mame/includes/bigevglf.h @@ -89,6 +89,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_bigevglf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -100,6 +101,6 @@ public: /*----------- defined in video/bigevglf.c -----------*/ -SCREEN_UPDATE_IND16( bigevglf ); + diff --git a/src/mame/includes/bigstrkb.h b/src/mame/includes/bigstrkb.h index eb7e2d94d23..61a991cbeac 100644 --- a/src/mame/includes/bigstrkb.h +++ b/src/mame/includes/bigstrkb.h @@ -30,10 +30,11 @@ public: TILE_GET_INFO_MEMBER(get_bsb_tile2_info); TILE_GET_INFO_MEMBER(get_bsb_tile3_info); virtual void video_start(); + UINT32 screen_update_bigstrkb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/bigstrkb.c -----------*/ -SCREEN_UPDATE_IND16(bigstrkb); + diff --git a/src/mame/includes/bionicc.h b/src/mame/includes/bionicc.h index c5ebcd326d0..b656034dbe9 100644 --- a/src/mame/includes/bionicc.h +++ b/src/mame/includes/bionicc.h @@ -50,6 +50,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_bionicc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -57,4 +58,4 @@ public: -SCREEN_UPDATE_IND16( bionicc ); + diff --git a/src/mame/includes/bishi.h b/src/mame/includes/bishi.h index 1b7537eba24..512e50c9a85 100644 --- a/src/mame/includes/bishi.h +++ b/src/mame/includes/bishi.h @@ -39,6 +39,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_bishi(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/bishi.c -----------*/ @@ -46,4 +47,4 @@ public: extern void bishi_tile_callback(running_machine &machine, int layer, int *code, int *color, int *flags); -SCREEN_UPDATE_RGB32(bishi); + diff --git a/src/mame/includes/bking.h b/src/mame/includes/bking.h index 336f8342e19..54771e0be79 100644 --- a/src/mame/includes/bking.h +++ b/src/mame/includes/bking.h @@ -87,6 +87,8 @@ public: DECLARE_MACHINE_START(bking3); DECLARE_MACHINE_RESET(bking3); DECLARE_MACHINE_RESET(common); + UINT32 screen_update_bking(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_bking(screen_device &screen, bool state); }; @@ -96,5 +98,5 @@ public: -SCREEN_UPDATE_IND16( bking ); -SCREEN_VBLANK( bking ); + + diff --git a/src/mame/includes/bladestl.h b/src/mame/includes/bladestl.h index 36bb51d3af0..3cd90defa23 100644 --- a/src/mame/includes/bladestl.h +++ b/src/mame/includes/bladestl.h @@ -34,6 +34,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void palette_init(); + UINT32 screen_update_bladestl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -42,7 +43,7 @@ public: -SCREEN_UPDATE_IND16( bladestl ); + void bladestl_tile_callback(running_machine &machine, int layer, int bank, int *code, int *color, int *flags); void bladestl_sprite_callback(running_machine &machine, int *code, int *color); diff --git a/src/mame/includes/blktiger.h b/src/mame/includes/blktiger.h index 5e55faccdba..e88a1753f73 100644 --- a/src/mame/includes/blktiger.h +++ b/src/mame/includes/blktiger.h @@ -62,6 +62,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_blktiger(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -70,4 +71,4 @@ public: -SCREEN_UPDATE_IND16( blktiger ); + diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h index 774d180f23e..9eb6aaea7c7 100644 --- a/src/mame/includes/blmbycar.h +++ b/src/mame/includes/blmbycar.h @@ -49,6 +49,7 @@ public: DECLARE_MACHINE_RESET(blmbycar); DECLARE_MACHINE_START(watrball); DECLARE_MACHINE_RESET(watrball); + UINT32 screen_update_blmbycar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -57,4 +58,4 @@ public: -SCREEN_UPDATE_IND16( blmbycar ); + diff --git a/src/mame/includes/blockade.h b/src/mame/includes/blockade.h index 8c3fe307c67..efc575d522c 100644 --- a/src/mame/includes/blockade.h +++ b/src/mame/includes/blockade.h @@ -26,6 +26,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_blockade(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -33,7 +34,7 @@ public: -SCREEN_UPDATE_IND16( blockade ); + /*----------- defined in audio/blockade.c -----------*/ diff --git a/src/mame/includes/blockhl.h b/src/mame/includes/blockhl.h index 6505aacef91..3268cf412f9 100644 --- a/src/mame/includes/blockhl.h +++ b/src/mame/includes/blockhl.h @@ -36,6 +36,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_blockhl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/blockhl.c -----------*/ @@ -44,4 +45,4 @@ extern void blockhl_tile_callback(running_machine &machine, int layer,int bank,i extern void blockhl_sprite_callback(running_machine &machine, int *code,int *color,int *priority,int *shadow); -SCREEN_UPDATE_IND16( blockhl ); + diff --git a/src/mame/includes/blockout.h b/src/mame/includes/blockout.h index d80d3938d0e..8ff4d9671d3 100644 --- a/src/mame/includes/blockout.h +++ b/src/mame/includes/blockout.h @@ -34,6 +34,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_blockout(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -41,4 +42,4 @@ public: -SCREEN_UPDATE_IND16( blockout ); + diff --git a/src/mame/includes/bloodbro.h b/src/mame/includes/bloodbro.h index 3eba36e490b..a00300ed02a 100644 --- a/src/mame/includes/bloodbro.h +++ b/src/mame/includes/bloodbro.h @@ -26,13 +26,16 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_tx_tile_info); virtual void video_start(); + UINT32 screen_update_bloodbro(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_weststry(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_skysmash(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/bloodbro.c -----------*/ -SCREEN_UPDATE_IND16( bloodbro ); -SCREEN_UPDATE_IND16( weststry ); -SCREEN_UPDATE_IND16( skysmash ); + + + diff --git a/src/mame/includes/blstroid.h b/src/mame/includes/blstroid.h index 5ce9edf5a4a..635436b1e4c 100644 --- a/src/mame/includes/blstroid.h +++ b/src/mame/includes/blstroid.h @@ -21,12 +21,13 @@ public: DECLARE_MACHINE_START(blstroid); DECLARE_MACHINE_RESET(blstroid); DECLARE_VIDEO_START(blstroid); + UINT32 screen_update_blstroid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/blstroid.c -----------*/ -SCREEN_UPDATE_IND16( blstroid ); + void blstroid_scanline_update(screen_device &screen, int scanline); diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h index b570f2c3c0b..b48e1a3e1df 100644 --- a/src/mame/includes/blueprnt.h +++ b/src/mame/includes/blueprnt.h @@ -41,6 +41,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_blueprnt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -49,4 +50,4 @@ public: -SCREEN_UPDATE_IND16( blueprnt ); + diff --git a/src/mame/includes/bogeyman.h b/src/mame/includes/bogeyman.h index 11a500f5a7b..509ed183a0e 100644 --- a/src/mame/includes/bogeyman.h +++ b/src/mame/includes/bogeyman.h @@ -45,6 +45,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_bogeyman(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -53,4 +54,4 @@ public: -SCREEN_UPDATE_IND16( bogeyman ); + diff --git a/src/mame/includes/bombjack.h b/src/mame/includes/bombjack.h index 23fd5609f14..102be60e7d8 100644 --- a/src/mame/includes/bombjack.h +++ b/src/mame/includes/bombjack.h @@ -39,6 +39,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_bombjack(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -46,4 +47,4 @@ public: -SCREEN_UPDATE_IND16( bombjack ); + diff --git a/src/mame/includes/boogwing.h b/src/mame/includes/boogwing.h index 808b5cc97eb..1bf7de590a9 100644 --- a/src/mame/includes/boogwing.h +++ b/src/mame/includes/boogwing.h @@ -47,11 +47,12 @@ public: DECLARE_WRITE8_MEMBER(sound_bankswitch_w); DECLARE_DRIVER_INIT(boogwing); virtual void video_start(); + UINT32 screen_update_boogwing(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/boogwing.c -----------*/ -SCREEN_UPDATE_RGB32( boogwing ); + diff --git a/src/mame/includes/bottom9.h b/src/mame/includes/bottom9.h index a195e71c5c5..647646ea8e0 100644 --- a/src/mame/includes/bottom9.h +++ b/src/mame/includes/bottom9.h @@ -46,6 +46,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_bottom9(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/bottom9.c -----------*/ @@ -55,4 +56,4 @@ extern void bottom9_sprite_callback(running_machine &machine, int *code,int *col extern void bottom9_zoom_callback(running_machine &machine, int *code,int *color,int *flags); -SCREEN_UPDATE_IND16( bottom9 ); + diff --git a/src/mame/includes/brkthru.h b/src/mame/includes/brkthru.h index 78eb8da0ba8..a7a5d9ab33d 100644 --- a/src/mame/includes/brkthru.h +++ b/src/mame/includes/brkthru.h @@ -45,6 +45,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_brkthru(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -52,4 +53,4 @@ public: -SCREEN_UPDATE_IND16( brkthru ); + diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h index 760d0428c4b..0f8685e5d84 100644 --- a/src/mame/includes/bsktball.h +++ b/src/mame/includes/bsktball.h @@ -55,6 +55,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_bsktball(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -75,5 +76,5 @@ DISCRETE_SOUND_EXTERN( bsktball ); /*----------- defined in video/bsktball.c -----------*/ -SCREEN_UPDATE_IND16( bsktball ); + diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h index 0386803d107..006b86a605c 100644 --- a/src/mame/includes/btime.h +++ b/src/mame/includes/btime.h @@ -107,6 +107,13 @@ public: DECLARE_MACHINE_START(mmonkey); DECLARE_MACHINE_RESET(mmonkey); DECLARE_VIDEO_START(bnj); + UINT32 screen_update_btime(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_cookrace(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_lnc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_eggs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_bnj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_zoar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_disco(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -122,11 +129,11 @@ public: -SCREEN_UPDATE_IND16( btime ); -SCREEN_UPDATE_IND16( cookrace ); -SCREEN_UPDATE_IND16( bnj ); -SCREEN_UPDATE_IND16( lnc ); -SCREEN_UPDATE_IND16( zoar ); -SCREEN_UPDATE_IND16( disco ); -SCREEN_UPDATE_IND16( eggs ); + + + + + + + diff --git a/src/mame/includes/bublbobl.h b/src/mame/includes/bublbobl.h index e208458e9b9..03f080f48bf 100644 --- a/src/mame/includes/bublbobl.h +++ b/src/mame/includes/bublbobl.h @@ -108,6 +108,7 @@ public: DECLARE_MACHINE_RESET(bub68705); DECLARE_MACHINE_START(common); DECLARE_MACHINE_RESET(common); + UINT32 screen_update_bublbobl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -122,4 +123,4 @@ INTERRUPT_GEN( bublbobl_m68705_interrupt ); /*----------- defined in video/bublbobl.c -----------*/ -SCREEN_UPDATE_IND16( bublbobl ); + diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h index be90dc901ea..8c04799a797 100644 --- a/src/mame/includes/buggychl.h +++ b/src/mame/includes/buggychl.h @@ -55,6 +55,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_buggychl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -63,4 +64,4 @@ public: -SCREEN_UPDATE_IND16( buggychl ); + diff --git a/src/mame/includes/bwing.h b/src/mame/includes/bwing.h index 97c0f797d67..05025b69d3e 100644 --- a/src/mame/includes/bwing.h +++ b/src/mame/includes/bwing.h @@ -74,6 +74,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_bwing(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -83,4 +84,4 @@ extern const gfx_layout bwing_tilelayout; -SCREEN_UPDATE_IND16( bwing ); + diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h index f3ca802b640..273167e9c50 100644 --- a/src/mame/includes/cabal.h +++ b/src/mame/includes/cabal.h @@ -34,6 +34,7 @@ public: TILE_GET_INFO_MEMBER(get_text_tile_info); virtual void video_start(); DECLARE_MACHINE_RESET(cabalbl); + UINT32 screen_update_cabal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/calomega.h b/src/mame/includes/calomega.h index be0f556aebd..992fbae16e9 100644 --- a/src/mame/includes/calomega.h +++ b/src/mame/includes/calomega.h @@ -43,6 +43,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_calomega(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -50,4 +51,4 @@ public: -SCREEN_UPDATE_IND16( calomega ); + diff --git a/src/mame/includes/canyon.h b/src/mame/includes/canyon.h index 11621d98b45..3fc3cde855a 100644 --- a/src/mame/includes/canyon.h +++ b/src/mame/includes/canyon.h @@ -36,6 +36,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_canyon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -52,5 +53,5 @@ DISCRETE_SOUND_EXTERN( canyon ); /*----------- defined in video/canyon.c -----------*/ -SCREEN_UPDATE_IND16( canyon ); + diff --git a/src/mame/includes/capbowl.h b/src/mame/includes/capbowl.h index ab1620364b7..2934598a7d0 100644 --- a/src/mame/includes/capbowl.h +++ b/src/mame/includes/capbowl.h @@ -40,11 +40,12 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_capbowl(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/capbowl.c -----------*/ -SCREEN_UPDATE_RGB32( capbowl ); + diff --git a/src/mame/includes/carjmbre.h b/src/mame/includes/carjmbre.h index 4b621fc49ff..75c586ec732 100644 --- a/src/mame/includes/carjmbre.h +++ b/src/mame/includes/carjmbre.h @@ -31,6 +31,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_carjmbre(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -40,6 +41,6 @@ public: -SCREEN_UPDATE_IND16( carjmbre ); + diff --git a/src/mame/includes/carpolo.h b/src/mame/includes/carpolo.h index 1d928bca4f1..8080bbd2268 100644 --- a/src/mame/includes/carpolo.h +++ b/src/mame/includes/carpolo.h @@ -66,6 +66,8 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_carpolo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_carpolo(screen_device &screen, bool state); }; @@ -100,5 +102,5 @@ void carpolo_generate_car_border_interrupt(running_machine &machine, int car, in -SCREEN_UPDATE_IND16( carpolo ); -SCREEN_VBLANK( carpolo ); + + diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h index 902aa8613d7..4a3a7344c34 100644 --- a/src/mame/includes/cave.h +++ b/src/mame/includes/cave.h @@ -200,6 +200,7 @@ public: DECLARE_PALETTE_INIT(pwrinst2); DECLARE_VIDEO_START(sailormn_3_layers); DECLARE_PALETTE_INIT(sailormn); + UINT32 screen_update_cave(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/cave.c -----------*/ @@ -221,7 +222,7 @@ public: -SCREEN_UPDATE_IND16( cave ); + void cave_get_sprite_info(running_machine &machine); void sailormn_tilebank_w(running_machine &machine, int bank); diff --git a/src/mame/includes/cbasebal.h b/src/mame/includes/cbasebal.h index 2a18d197cd7..a0e15f2a000 100644 --- a/src/mame/includes/cbasebal.h +++ b/src/mame/includes/cbasebal.h @@ -48,10 +48,11 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_cbasebal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/cbasebal.c -----------*/ -SCREEN_UPDATE_IND16( cbasebal ); + diff --git a/src/mame/includes/cbuster.h b/src/mame/includes/cbuster.h index ee839201453..649f2720bc1 100644 --- a/src/mame/includes/cbuster.h +++ b/src/mame/includes/cbuster.h @@ -42,6 +42,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_twocrude(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -50,4 +51,4 @@ public: -SCREEN_UPDATE_RGB32( twocrude ); + diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h index 1f36204c9ca..326ff689cf6 100644 --- a/src/mame/includes/ccastles.h +++ b/src/mame/includes/ccastles.h @@ -67,6 +67,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_ccastles(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -74,7 +75,7 @@ public: -SCREEN_UPDATE_IND16( ccastles ); + diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h index 8c5bd208b0e..b6d9e2487c7 100644 --- a/src/mame/includes/cclimber.h +++ b/src/mame/includes/cclimber.h @@ -66,6 +66,10 @@ public: DECLARE_PALETTE_INIT(yamato); DECLARE_VIDEO_START(toprollr); DECLARE_PALETTE_INIT(toprollr); + UINT32 screen_update_cclimber(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_swimmer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_yamato(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_toprollr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -77,15 +81,15 @@ public: -SCREEN_UPDATE_IND16( cclimber ); -SCREEN_UPDATE_IND16( swimmer ); -SCREEN_UPDATE_IND16( yamato ); -SCREEN_UPDATE_IND16( toprollr ); + + + + diff --git a/src/mame/includes/cdi.h b/src/mame/includes/cdi.h index a1541ee692d..56a221287c8 100644 --- a/src/mame/includes/cdi.h +++ b/src/mame/includes/cdi.h @@ -45,6 +45,8 @@ public: DECLARE_MACHINE_RESET(quizrr40); DECLARE_MACHINE_RESET(quizrr41); DECLARE_MACHINE_RESET(quizrr42); + UINT32 screen_update_cdimono1(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_cdimono1_lcd(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- debug defines -----------*/ diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h index 6847e228805..ddc0a00591a 100644 --- a/src/mame/includes/centiped.h +++ b/src/mame/includes/centiped.h @@ -75,6 +75,10 @@ public: DECLARE_VIDEO_START(milliped); DECLARE_VIDEO_START(warlords); DECLARE_PALETTE_INIT(warlords); + UINT32 screen_update_centiped(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_bullsdrt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_milliped(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_warlords(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -87,8 +91,8 @@ public: -SCREEN_UPDATE_IND16( centiped ); -SCREEN_UPDATE_IND16( milliped ); -SCREEN_UPDATE_IND16( warlords ); -SCREEN_UPDATE_IND16( bullsdrt ); + + + + diff --git a/src/mame/includes/chaknpop.h b/src/mame/includes/chaknpop.h index e518a772969..26f71d676bb 100644 --- a/src/mame/includes/chaknpop.h +++ b/src/mame/includes/chaknpop.h @@ -52,6 +52,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_chaknpop(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -64,5 +65,5 @@ public: -SCREEN_UPDATE_IND16( chaknpop ); + diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h index cac5bdf9bd8..1e99e617526 100644 --- a/src/mame/includes/champbas.h +++ b/src/mame/includes/champbas.h @@ -60,6 +60,9 @@ public: DECLARE_MACHINE_START(exctsccr); DECLARE_VIDEO_START(exctsccr); DECLARE_PALETTE_INIT(exctsccr); + UINT32 screen_update_champbas(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_exctsccr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_champbas(screen_device &screen, bool state); }; @@ -70,7 +73,7 @@ public: -SCREEN_UPDATE_IND16( champbas ); -SCREEN_UPDATE_IND16( exctsccr ); + + diff --git a/src/mame/includes/changela.h b/src/mame/includes/changela.h index d336e1ed15c..27df6594ee0 100644 --- a/src/mame/includes/changela.h +++ b/src/mame/includes/changela.h @@ -88,10 +88,11 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_changela(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/changela.c -----------*/ -SCREEN_UPDATE_IND16( changela ); + diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h index fbc74469be5..2edc9b827ea 100644 --- a/src/mame/includes/cheekyms.h +++ b/src/mame/includes/cheekyms.h @@ -35,6 +35,7 @@ public: virtual void machine_start(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_cheekyms(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -42,4 +43,4 @@ public: -SCREEN_UPDATE_IND16( cheekyms ); + diff --git a/src/mame/includes/chqflag.h b/src/mame/includes/chqflag.h index 834a432b303..38bc301b00b 100644 --- a/src/mame/includes/chqflag.h +++ b/src/mame/includes/chqflag.h @@ -43,6 +43,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_chqflag(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/chqflag.c -----------*/ @@ -52,4 +53,4 @@ extern void chqflag_zoom_callback_0(running_machine &machine, int *code,int *col extern void chqflag_zoom_callback_1(running_machine &machine, int *code,int *color,int *flags); -SCREEN_UPDATE_IND16( chqflag ); + diff --git a/src/mame/includes/cinemat.h b/src/mame/includes/cinemat.h index 81cbbbbd4da..5c9940d5e51 100644 --- a/src/mame/includes/cinemat.h +++ b/src/mame/includes/cinemat.h @@ -64,6 +64,8 @@ public: DECLARE_VIDEO_START(cinemat_64level); DECLARE_VIDEO_START(cinemat_color); DECLARE_VIDEO_START(cinemat_qb3color); + UINT32 screen_update_cinemat(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_spacewar(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -97,6 +99,6 @@ void cinemat_vector_callback(device_t *device, INT16 sx, INT16 sy, INT16 ex, INT -SCREEN_UPDATE_RGB32( cinemat ); -SCREEN_UPDATE_RGB32( spacewar ); + + diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h index d6a337c2996..381c3221361 100644 --- a/src/mame/includes/circus.h +++ b/src/mame/includes/circus.h @@ -36,6 +36,10 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_circus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_robotbwl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_crash(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_ripcord(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h index 5dfc0c7d9df..8c6dd6e53b2 100644 --- a/src/mame/includes/circusc.h +++ b/src/mame/includes/circusc.h @@ -57,6 +57,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_circusc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -65,4 +66,4 @@ public: -SCREEN_UPDATE_IND16( circusc ); + diff --git a/src/mame/includes/cischeat.h b/src/mame/includes/cischeat.h index 8a7234c8b87..274eaed050c 100644 --- a/src/mame/includes/cischeat.h +++ b/src/mame/includes/cischeat.h @@ -80,6 +80,10 @@ public: DECLARE_VIDEO_START(bigrun); DECLARE_VIDEO_START(f1gpstar); DECLARE_VIDEO_START(cischeat); + UINT32 screen_update_bigrun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_scudhamm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_cischeat(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_f1gpstar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -92,7 +96,7 @@ public: -SCREEN_UPDATE_IND16( bigrun ); -SCREEN_UPDATE_IND16( cischeat ); -SCREEN_UPDATE_IND16( f1gpstar ); -SCREEN_UPDATE_IND16( scudhamm ); + + + + diff --git a/src/mame/includes/citycon.h b/src/mame/includes/citycon.h index eee487c1d13..46f376669dc 100644 --- a/src/mame/includes/citycon.h +++ b/src/mame/includes/citycon.h @@ -40,11 +40,12 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_citycon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/citycon.c -----------*/ -SCREEN_UPDATE_IND16( citycon ); + diff --git a/src/mame/includes/cloak.h b/src/mame/includes/cloak.h index 0dce9078f26..e75599092a2 100644 --- a/src/mame/includes/cloak.h +++ b/src/mame/includes/cloak.h @@ -40,6 +40,7 @@ public: void adjust_xy(int offset); TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); + UINT32 screen_update_cloak(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -48,4 +49,4 @@ public: -SCREEN_UPDATE_IND16( cloak ); + diff --git a/src/mame/includes/cloud9.h b/src/mame/includes/cloud9.h index 5ffc8ab3d6d..002001f7e98 100644 --- a/src/mame/includes/cloud9.h +++ b/src/mame/includes/cloud9.h @@ -58,13 +58,14 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_cloud9(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/cloud9.c -----------*/ -SCREEN_UPDATE_IND16( cloud9 ); + diff --git a/src/mame/includes/clshroad.h b/src/mame/includes/clshroad.h index 7f56d5fbaeb..fcfd61197bd 100644 --- a/src/mame/includes/clshroad.h +++ b/src/mame/includes/clshroad.h @@ -30,6 +30,7 @@ public: DECLARE_PALETTE_INIT(firebatl); DECLARE_VIDEO_START(clshroad); DECLARE_PALETTE_INIT(clshroad); + UINT32 screen_update_clshroad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -40,4 +41,4 @@ public: -SCREEN_UPDATE_IND16( clshroad ); + diff --git a/src/mame/includes/cninja.h b/src/mame/includes/cninja.h index f1eb3e28bb3..b427480cdc9 100644 --- a/src/mame/includes/cninja.h +++ b/src/mame/includes/cninja.h @@ -65,6 +65,11 @@ public: virtual void machine_reset(); DECLARE_VIDEO_START(stoneage); DECLARE_VIDEO_START(mutantf); + UINT32 screen_update_cninja(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_cninjabl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_edrandy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_robocop2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_mutantf(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/cninja.c -----------*/ @@ -72,8 +77,8 @@ public: -SCREEN_UPDATE_IND16( cninja ); -SCREEN_UPDATE_IND16( cninjabl ); -SCREEN_UPDATE_IND16( edrandy ); -SCREEN_UPDATE_IND16( robocop2 ); -SCREEN_UPDATE_RGB32( mutantf ); + + + + + diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h index 37827657264..9f2688aa730 100644 --- a/src/mame/includes/combatsc.h +++ b/src/mame/includes/combatsc.h @@ -79,6 +79,8 @@ public: DECLARE_MACHINE_START(combatscb); DECLARE_VIDEO_START(combatscb); DECLARE_PALETTE_INIT(combatscb); + UINT32 screen_update_combatsc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_combatscb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -90,5 +92,5 @@ public: -SCREEN_UPDATE_IND16( combatscb ); -SCREEN_UPDATE_IND16( combatsc ); + + diff --git a/src/mame/includes/commando.h b/src/mame/includes/commando.h index 95c1e13707c..daa9a757fc9 100644 --- a/src/mame/includes/commando.h +++ b/src/mame/includes/commando.h @@ -46,6 +46,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_commando(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -54,4 +55,4 @@ public: -SCREEN_UPDATE_IND16( commando ); + diff --git a/src/mame/includes/compgolf.h b/src/mame/includes/compgolf.h index 3a6dc92a16d..aa8d96f9ce3 100644 --- a/src/mame/includes/compgolf.h +++ b/src/mame/includes/compgolf.h @@ -41,6 +41,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_compgolf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -48,4 +49,4 @@ public: -SCREEN_UPDATE_IND16( compgolf ); + diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h index 5aa20715699..6bec2dae25e 100644 --- a/src/mame/includes/contra.h +++ b/src/mame/includes/contra.h @@ -60,6 +60,7 @@ public: virtual void machine_start(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_contra(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -69,5 +70,5 @@ public: -SCREEN_UPDATE_IND16( contra ); + diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h index d2e499cf974..603bc6a2364 100644 --- a/src/mame/includes/cop01.h +++ b/src/mame/includes/cop01.h @@ -46,6 +46,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_cop01(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -55,5 +56,5 @@ public: -SCREEN_UPDATE_IND16( cop01 ); + diff --git a/src/mame/includes/copsnrob.h b/src/mame/includes/copsnrob.h index 69b4d526d50..1e549f2d713 100644 --- a/src/mame/includes/copsnrob.h +++ b/src/mame/includes/copsnrob.h @@ -36,6 +36,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void palette_init(); + UINT32 screen_update_copsnrob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -46,7 +47,7 @@ DECLARE_READ8_HANDLER( copsnrob_gun_position_r ); /*----------- defined in video/copsnrob.c -----------*/ -SCREEN_UPDATE_IND16( copsnrob ); + /*----------- defined in audio/copsnrob.c -----------*/ diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h index e35cf989230..51bb0c0941d 100644 --- a/src/mame/includes/cosmic.h +++ b/src/mame/includes/cosmic.h @@ -69,6 +69,12 @@ public: DECLARE_PALETTE_INIT(cosmica); DECLARE_PALETTE_INIT(magspot); DECLARE_PALETTE_INIT(nomnlnd); + UINT32 screen_update_cosmicg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_panic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_cosmica(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_magspot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_devzone(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_nomnlnd(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -81,9 +87,9 @@ public: -SCREEN_UPDATE_IND16( panic ); -SCREEN_UPDATE_IND16( magspot ); -SCREEN_UPDATE_IND16( devzone ); -SCREEN_UPDATE_IND16( cosmica ); -SCREEN_UPDATE_IND16( cosmicg ); -SCREEN_UPDATE_IND16( nomnlnd ); + + + + + + diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h index 83b48d84ac0..0c2af5d3c59 100644 --- a/src/mame/includes/cps1.h +++ b/src/mame/includes/cps1.h @@ -209,6 +209,10 @@ public: DECLARE_MACHINE_START(qsound); DECLARE_MACHINE_RESET(cps); DECLARE_VIDEO_START(cps); + UINT32 screen_update_cps1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_fcrash(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_kodb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_cps1(screen_device &screen, bool state); }; /*----------- defined in drivers/cps1.c -----------*/ @@ -227,8 +231,8 @@ GFXDECODE_EXTERN( cps1 ); -SCREEN_UPDATE_IND16( cps1 ); -SCREEN_VBLANK( cps1 ); + + void cps1_get_video_base(running_machine &machine); void cps2_set_sprite_priorities(running_machine &machine); diff --git a/src/mame/includes/cps3.h b/src/mame/includes/cps3.h index bf5baaa559a..0b2e529daf7 100644 --- a/src/mame/includes/cps3.h +++ b/src/mame/includes/cps3.h @@ -105,6 +105,7 @@ public: DECLARE_DRIVER_INIT(sfiii2); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_cps3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/crbaloon.h b/src/mame/includes/crbaloon.h index 7ce16da31cb..e1f658fb704 100644 --- a/src/mame/includes/crbaloon.h +++ b/src/mame/includes/crbaloon.h @@ -36,6 +36,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_crbaloon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -55,7 +56,7 @@ MACHINE_CONFIG_EXTERN( crbaloon_audio ); -SCREEN_UPDATE_IND16( crbaloon ); + UINT16 crbaloon_get_collision_address(running_machine &machine); diff --git a/src/mame/includes/crgolf.h b/src/mame/includes/crgolf.h index 1c1252d04f6..8faa5f19971 100644 --- a/src/mame/includes/crgolf.h +++ b/src/mame/includes/crgolf.h @@ -53,6 +53,7 @@ public: virtual void machine_start(); virtual void machine_reset(); DECLARE_VIDEO_START(crgolf); + UINT32 screen_update_crgolf(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/crgolf.c -----------*/ diff --git a/src/mame/includes/crimfght.h b/src/mame/includes/crimfght.h index b4a3f722c3f..6a14b7ab369 100644 --- a/src/mame/includes/crimfght.h +++ b/src/mame/includes/crimfght.h @@ -31,6 +31,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_crimfght(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/crimfght.c -----------*/ @@ -39,4 +40,4 @@ extern void crimfght_tile_callback(running_machine &machine, int layer,int bank, extern void crimfght_sprite_callback(running_machine &machine, int *code,int *color,int *priority,int *shadow); -SCREEN_UPDATE_IND16( crimfght ); + diff --git a/src/mame/includes/crospang.h b/src/mame/includes/crospang.h index c882f581dd9..30301674c7c 100644 --- a/src/mame/includes/crospang.h +++ b/src/mame/includes/crospang.h @@ -44,13 +44,14 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_crospang(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/crospang.c -----------*/ -SCREEN_UPDATE_IND16( crospang ); + diff --git a/src/mame/includes/crshrace.h b/src/mame/includes/crshrace.h index 4cb86af129e..c9d652d7afb 100644 --- a/src/mame/includes/crshrace.h +++ b/src/mame/includes/crshrace.h @@ -50,11 +50,13 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_crshrace(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_crshrace(screen_device &screen, bool state); }; /*----------- defined in video/crshrace.c -----------*/ -SCREEN_VBLANK( crshrace ); -SCREEN_UPDATE_IND16( crshrace ); + + diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h index 6872a3e5fc4..c674db27347 100644 --- a/src/mame/includes/cvs.h +++ b/src/mame/includes/cvs.h @@ -104,6 +104,7 @@ public: DECLARE_MACHINE_RESET(cvs); DECLARE_VIDEO_START(cvs); DECLARE_PALETTE_INIT(cvs); + UINT32 screen_update_cvs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -121,5 +122,5 @@ void cvs_scroll_stars( running_machine &machine ); void cvs_update_stars(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, const pen_t star_pen, bool update_always); -SCREEN_UPDATE_IND16( cvs ); + diff --git a/src/mame/includes/cyberbal.h b/src/mame/includes/cyberbal.h index ec453b16029..7a07fad95b2 100644 --- a/src/mame/includes/cyberbal.h +++ b/src/mame/includes/cyberbal.h @@ -53,6 +53,9 @@ public: DECLARE_VIDEO_START(cyberbal); DECLARE_MACHINE_RESET(cyberbal2p); DECLARE_VIDEO_START(cyberbal2p); + UINT32 screen_update_cyberbal_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_cyberbal_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_cyberbal2p(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -75,8 +78,8 @@ DECLARE_WRITE16_HANDLER( cyberbal_paletteram_1_w ); -SCREEN_UPDATE_IND16( cyberbal_left ); -SCREEN_UPDATE_IND16( cyberbal_right ); -SCREEN_UPDATE_IND16( cyberbal2p ); + + + void cyberbal_scanline_update(screen_device &screen, int scanline); diff --git a/src/mame/includes/darius.h b/src/mame/includes/darius.h index 8d2e99d0355..e83663ec888 100644 --- a/src/mame/includes/darius.h +++ b/src/mame/includes/darius.h @@ -90,6 +90,9 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_darius_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_darius_middle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_darius_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -97,6 +100,6 @@ public: -SCREEN_UPDATE_IND16( darius_left ); -SCREEN_UPDATE_IND16( darius_middle ); -SCREEN_UPDATE_IND16( darius_right ); + + + diff --git a/src/mame/includes/darkmist.h b/src/mame/includes/darkmist.h index 72451679dd0..4fe6841e92a 100644 --- a/src/mame/includes/darkmist.h +++ b/src/mame/includes/darkmist.h @@ -27,12 +27,13 @@ public: TILE_GET_INFO_MEMBER(get_txttile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_darkmist(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/darkmist.c -----------*/ -SCREEN_UPDATE_IND16( darkmist ); + diff --git a/src/mame/includes/darkseal.h b/src/mame/includes/darkseal.h index 4ab5ae04a89..04eb03ef824 100644 --- a/src/mame/includes/darkseal.h +++ b/src/mame/includes/darkseal.h @@ -30,11 +30,12 @@ public: DECLARE_WRITE16_MEMBER(darkseal_palette_24bit_b_w); DECLARE_DRIVER_INIT(darkseal); virtual void video_start(); + UINT32 screen_update_darkseal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/darkseal.c -----------*/ -SCREEN_UPDATE_IND16( darkseal ); + diff --git a/src/mame/includes/dassault.h b/src/mame/includes/dassault.h index 3e452903a11..1d9cd7f1fc3 100644 --- a/src/mame/includes/dassault.h +++ b/src/mame/includes/dassault.h @@ -59,6 +59,7 @@ public: DECLARE_DRIVER_INIT(thndzone); DECLARE_DRIVER_INIT(dassault); virtual void video_start(); + UINT32 screen_update_dassault(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -66,4 +67,4 @@ public: /*----------- defined in video/dassault.c -----------*/ -SCREEN_UPDATE_RGB32( dassault ); + diff --git a/src/mame/includes/dbz.h b/src/mame/includes/dbz.h index 3c413499fe7..0291fff5ee7 100644 --- a/src/mame/includes/dbz.h +++ b/src/mame/includes/dbz.h @@ -50,6 +50,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_dbz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -60,4 +61,4 @@ extern void dbz_tile_callback(running_machine &machine, int layer, int *code, in -SCREEN_UPDATE_IND16(dbz); + diff --git a/src/mame/includes/dc.h b/src/mame/includes/dc.h index 52a5f3b633c..a8cec47c057 100644 --- a/src/mame/includes/dc.h +++ b/src/mame/includes/dc.h @@ -96,6 +96,7 @@ class dc_state : public driver_device virtual void machine_reset(); virtual void video_start(); DECLARE_MACHINE_RESET(naomi); + UINT32 screen_update_dc(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in machine/dc.c -----------*/ @@ -307,7 +308,7 @@ DECLARE_WRITE32_HANDLER( elan_regs_w ); DECLARE_WRITE64_HANDLER( ta_fifo_poly_w ); DECLARE_WRITE64_HANDLER( ta_fifo_yuv_w ); -SCREEN_UPDATE_RGB32(dc); + /*--------------- CORE registers --------------*/ #define PVRID ((0x005f8000-0x005f8000)/4) diff --git a/src/mame/includes/dcheese.h b/src/mame/includes/dcheese.h index 19cc406fce5..ade008f2aef 100644 --- a/src/mame/includes/dcheese.h +++ b/src/mame/includes/dcheese.h @@ -46,6 +46,7 @@ public: virtual void machine_start(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_dcheese(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -58,6 +59,6 @@ void dcheese_signal_irq(running_machine &machine, int which); -SCREEN_UPDATE_IND16( dcheese ); + diff --git a/src/mame/includes/dcon.h b/src/mame/includes/dcon.h index 9a603ced17b..063f749d5a7 100644 --- a/src/mame/includes/dcon.h +++ b/src/mame/includes/dcon.h @@ -37,6 +37,8 @@ public: TILE_GET_INFO_MEMBER(get_mid_tile_info); TILE_GET_INFO_MEMBER(get_text_tile_info); virtual void video_start(); + UINT32 screen_update_dcon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_sdgndmps(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -44,5 +46,5 @@ public: -SCREEN_UPDATE_IND16( dcon ); -SCREEN_UPDATE_IND16( sdgndmps ); + + diff --git a/src/mame/includes/dday.h b/src/mame/includes/dday.h index 02e4c3ffc04..036ed9dee21 100644 --- a/src/mame/includes/dday.h +++ b/src/mame/includes/dday.h @@ -50,6 +50,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_dday(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -57,5 +58,5 @@ public: -SCREEN_UPDATE_IND16( dday ); + diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h index 06ea3f2146d..6d95148ae11 100644 --- a/src/mame/includes/ddragon.h +++ b/src/mame/includes/ddragon.h @@ -99,6 +99,7 @@ public: DECLARE_MACHINE_START(ddragon); DECLARE_MACHINE_RESET(ddragon); DECLARE_VIDEO_START(ddragon); + UINT32 screen_update_ddragon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -107,5 +108,5 @@ public: -SCREEN_UPDATE_IND16( ddragon ); + diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h index 77a34430107..f77c075a7ac 100644 --- a/src/mame/includes/ddragon3.h +++ b/src/mame/includes/ddragon3.h @@ -47,6 +47,8 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_ddragon3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_ctribe(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h index e67be5d2e32..5e2ae40c157 100644 --- a/src/mame/includes/ddribble.h +++ b/src/mame/includes/ddribble.h @@ -59,6 +59,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_ddribble(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/ddribble.c -----------*/ @@ -66,4 +67,4 @@ public: -SCREEN_UPDATE_IND16( ddribble ); + diff --git a/src/mame/includes/deadang.h b/src/mame/includes/deadang.h index 4f905012aad..59843cc7c4a 100644 --- a/src/mame/includes/deadang.h +++ b/src/mame/includes/deadang.h @@ -32,6 +32,7 @@ public: TILE_GET_INFO_MEMBER(get_pf1_tile_info); TILE_GET_INFO_MEMBER(get_text_tile_info); virtual void video_start(); + UINT32 screen_update_deadang(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -39,4 +40,4 @@ public: -SCREEN_UPDATE_IND16( deadang ); + diff --git a/src/mame/includes/dec0.h b/src/mame/includes/dec0.h index ec3c2b9d58d..f3bd0e3b164 100644 --- a/src/mame/includes/dec0.h +++ b/src/mame/includes/dec0.h @@ -72,6 +72,13 @@ public: DECLARE_VIDEO_START(dec0); DECLARE_MACHINE_RESET(slyspy); DECLARE_VIDEO_START(dec0_nodma); + UINT32 screen_update_hbarrel(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_baddudes(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_birdtry(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_robocop(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_hippodrm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_slyspy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_midres(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -96,6 +103,8 @@ public: UINT16 m_automat_scroll_regs[4]; DECLARE_VIDEO_START(automat); + UINT32 screen_update_automat(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_secretab(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -105,17 +114,17 @@ public: -SCREEN_UPDATE_IND16( hbarrel ); -SCREEN_UPDATE_IND16( baddudes ); -SCREEN_UPDATE_IND16( birdtry ); -SCREEN_UPDATE_IND16( robocop ); -SCREEN_UPDATE_IND16( hippodrm ); -SCREEN_UPDATE_IND16( slyspy ); -SCREEN_UPDATE_IND16( midres ); + + + + + + + // bootlegs -SCREEN_UPDATE_IND16( automat ); -SCREEN_UPDATE_IND16( secretab ); + + /*----------- defined in machine/dec0.c -----------*/ diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h index 1dd5a475b87..8a0bce70538 100644 --- a/src/mame/includes/dec8.h +++ b/src/mame/includes/dec8.h @@ -121,20 +121,29 @@ public: DECLARE_VIDEO_START(oscar); DECLARE_VIDEO_START(srdarwin); DECLARE_VIDEO_START(cobracom); + UINT32 screen_update_lastmisn(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_shackled(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_gondo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_garyoret(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_ghostb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_oscar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_srdarwin(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_cobracom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_dec8(screen_device &screen, bool state); }; /*----------- defined in video/dec8.c -----------*/ -SCREEN_UPDATE_IND16( cobracom ); -SCREEN_UPDATE_IND16( ghostb ); -SCREEN_UPDATE_IND16( srdarwin ); -SCREEN_UPDATE_IND16( gondo ); -SCREEN_UPDATE_IND16( garyoret ); -SCREEN_UPDATE_IND16( lastmisn ); -SCREEN_UPDATE_IND16( shackled ); -SCREEN_UPDATE_IND16( oscar ); + + + + + + + + diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h index 230a4f1a3c7..17965eefcfb 100644 --- a/src/mame/includes/deco32.h +++ b/src/mame/includes/deco32.h @@ -105,6 +105,10 @@ public: DECLARE_VIDEO_START(captaven); DECLARE_VIDEO_START(fghthist); DECLARE_VIDEO_START(nslasher); + UINT32 screen_update_captaven(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_fghthist(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_nslasher(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void screen_eof_captaven(screen_device &screen, bool state); }; class dragngun_state : public deco32_state @@ -131,6 +135,8 @@ public: DECLARE_DRIVER_INIT(lockload); DECLARE_VIDEO_START(dragngun); DECLARE_VIDEO_START(lockload); + UINT32 screen_update_dragngun(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void screen_eof_dragngun(screen_device &screen, bool state); }; @@ -143,13 +149,13 @@ public: -SCREEN_VBLANK( captaven ); -SCREEN_VBLANK( dragngun ); -SCREEN_UPDATE_IND16( captaven ); -SCREEN_UPDATE_RGB32( fghthist ); -SCREEN_UPDATE_RGB32( dragngun ); -SCREEN_UPDATE_RGB32( nslasher ); + + + + + + DECLARE_WRITE32_HANDLER( deco32_pf1_data_w ); diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h index a924bd0dc9a..79a036d6233 100644 --- a/src/mame/includes/deco_mlc.h +++ b/src/mame/includes/deco_mlc.h @@ -36,11 +36,13 @@ public: DECLARE_DRIVER_INIT(avengrgs); DECLARE_MACHINE_RESET(mlc); DECLARE_VIDEO_START(mlc); + UINT32 screen_update_mlc(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void screen_eof_mlc(screen_device &screen, bool state); }; /*----------- defined in video/deco_mlc.c -----------*/ -SCREEN_UPDATE_RGB32( mlc ); -SCREEN_VBLANK( mlc ); + + diff --git a/src/mame/includes/deniam.h b/src/mame/includes/deniam.h index 6d99fc156d7..ae8d618a674 100644 --- a/src/mame/includes/deniam.h +++ b/src/mame/includes/deniam.h @@ -60,6 +60,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_deniam(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -67,5 +68,5 @@ public: -SCREEN_UPDATE_IND16( deniam ); + diff --git a/src/mame/includes/dietgo.h b/src/mame/includes/dietgo.h index 3af8bc7ec6c..1b0e80db9a5 100644 --- a/src/mame/includes/dietgo.h +++ b/src/mame/includes/dietgo.h @@ -25,10 +25,11 @@ public: device_t *m_deco_tilegen1; DECLARE_DRIVER_INIT(dietgo); virtual void machine_start(); + UINT32 screen_update_dietgo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/dietgo.c -----------*/ -SCREEN_UPDATE_IND16( dietgo ); + diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h index 34dd56a410b..e85c49ad26c 100644 --- a/src/mame/includes/djboy.h +++ b/src/mame/includes/djboy.h @@ -71,6 +71,8 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_djboy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_djboy(screen_device &screen, bool state); }; @@ -78,5 +80,5 @@ public: -SCREEN_UPDATE_IND16( djboy ); -SCREEN_VBLANK( djboy ); + + diff --git a/src/mame/includes/djmain.h b/src/mame/includes/djmain.h index 7c54b1e42b7..686165a065d 100644 --- a/src/mame/includes/djmain.h +++ b/src/mame/includes/djmain.h @@ -53,12 +53,13 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_djmain(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/djmain.c -----------*/ -SCREEN_UPDATE_RGB32( djmain ); + void djmain_tile_callback(running_machine& machine, int layer, int *code, int *color, int *flags); diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index 6f583e79cb0..70836e2be68 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -253,6 +253,9 @@ public: DECLARE_MACHINE_START(s2650); DECLARE_MACHINE_RESET(strtheat); DECLARE_MACHINE_RESET(drakton); + UINT32 screen_update_dkong(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_pestplce(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_spclforc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/dkong.c -----------*/ @@ -265,9 +268,9 @@ public: -SCREEN_UPDATE_IND16( dkong ); -SCREEN_UPDATE_IND16( pestplce ); -SCREEN_UPDATE_IND16( spclforc ); + + + /*----------- defined in audio/dkong.c -----------*/ diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h index 1074a677c53..846b61094b8 100644 --- a/src/mame/includes/docastle.h +++ b/src/mame/includes/docastle.h @@ -47,6 +47,7 @@ public: virtual void video_start(); virtual void palette_init(); DECLARE_VIDEO_START(dorunrun); + UINT32 screen_update_docastle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -59,5 +60,5 @@ public: -SCREEN_UPDATE_IND16( docastle ); + diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h index 1658e487da4..d1f33a014bc 100644 --- a/src/mame/includes/dogfgt.h +++ b/src/mame/includes/dogfgt.h @@ -52,6 +52,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_dogfgt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -60,4 +61,4 @@ public: -SCREEN_UPDATE_IND16( dogfgt ); + diff --git a/src/mame/includes/dooyong.h b/src/mame/includes/dooyong.h index 4395642c4cf..bf3e97eb0dd 100644 --- a/src/mame/includes/dooyong.h +++ b/src/mame/includes/dooyong.h @@ -79,6 +79,14 @@ public: DECLARE_VIDEO_START(primella); DECLARE_VIDEO_START(rshark); DECLARE_VIDEO_START(popbingo); + UINT32 screen_update_lastday(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_gulfstrm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_pollux(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_bluehawk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_flytiger(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_primella(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_rshark(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_popbingo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -88,14 +96,14 @@ public: -SCREEN_UPDATE_IND16( lastday ); -SCREEN_UPDATE_IND16( gulfstrm ); -SCREEN_UPDATE_IND16( pollux ); -SCREEN_UPDATE_IND16( bluehawk ); -SCREEN_UPDATE_IND16( flytiger ); -SCREEN_UPDATE_IND16( primella ); -SCREEN_UPDATE_IND16( rshark ); -SCREEN_UPDATE_IND16( popbingo ); + + + + + + + + diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h index 9457c178580..580eb9db322 100644 --- a/src/mame/includes/dragrace.h +++ b/src/mame/includes/dragrace.h @@ -53,6 +53,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_dragrace(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -63,4 +64,4 @@ DISCRETE_SOUND_EXTERN( dragrace ); /*----------- defined in video/dragrace.c -----------*/ -SCREEN_UPDATE_IND16( dragrace ); + diff --git a/src/mame/includes/drgnmst.h b/src/mame/includes/drgnmst.h index 9be41569a96..1ea8eb8f971 100644 --- a/src/mame/includes/drgnmst.h +++ b/src/mame/includes/drgnmst.h @@ -66,6 +66,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_drgnmst(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -73,4 +74,4 @@ public: -SCREEN_UPDATE_IND16(drgnmst); + diff --git a/src/mame/includes/dribling.h b/src/mame/includes/dribling.h index 9000ef094d9..a5ca16fe3f3 100644 --- a/src/mame/includes/dribling.h +++ b/src/mame/includes/dribling.h @@ -46,10 +46,11 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void palette_init(); + UINT32 screen_update_dribling(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/dribling.c -----------*/ -SCREEN_UPDATE_IND16( dribling ); + diff --git a/src/mame/includes/drmicro.h b/src/mame/includes/drmicro.h index 84f09f27484..71d6d891eed 100644 --- a/src/mame/includes/drmicro.h +++ b/src/mame/includes/drmicro.h @@ -34,6 +34,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_drmicro(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -41,5 +42,5 @@ public: -SCREEN_UPDATE_IND16( drmicro ); + diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h index 740ba66c4ff..bc22b33ea78 100644 --- a/src/mame/includes/dynax.h +++ b/src/mame/includes/dynax.h @@ -463,6 +463,14 @@ public: DECLARE_VIDEO_START(neruton); DECLARE_MACHINE_START(dynax); DECLARE_MACHINE_RESET(adpcm); + UINT32 screen_update_ddenlovr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_hanamai(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_hnoridur(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_sprtmtch(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_mjdialq2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_jantouki_top(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_jantouki_bottom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_htengoku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; //----------- defined in drivers/dynax.c ----------- @@ -483,13 +491,13 @@ void neruton_update_irq(running_machine &machine); -SCREEN_UPDATE_IND16( hanamai ); -SCREEN_UPDATE_IND16( hnoridur ); -SCREEN_UPDATE_IND16( sprtmtch ); -SCREEN_UPDATE_IND16( mjdialq2 ); -SCREEN_UPDATE_IND16( jantouki_top ); -SCREEN_UPDATE_IND16( jantouki_bottom ); -SCREEN_UPDATE_IND16( htengoku ); + + + + + + + @@ -497,4 +505,4 @@ SCREEN_UPDATE_IND16( htengoku ); //----------- defined in drivers/ddenlovr.c ----------- -SCREEN_UPDATE_IND16(ddenlovr); + diff --git a/src/mame/includes/dynduke.h b/src/mame/includes/dynduke.h index 7836ff3238c..7eb41612dba 100644 --- a/src/mame/includes/dynduke.h +++ b/src/mame/includes/dynduke.h @@ -40,10 +40,11 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_tx_tile_info); virtual void video_start(); + UINT32 screen_update_dynduke(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/dynduke.c -----------*/ -SCREEN_UPDATE_IND16( dynduke ); + diff --git a/src/mame/includes/eolith.h b/src/mame/includes/eolith.h index 37e8b19a607..24ff8fa3eee 100644 --- a/src/mame/includes/eolith.h +++ b/src/mame/includes/eolith.h @@ -39,10 +39,11 @@ public: DECLARE_DRIVER_INIT(landbrka); DECLARE_MACHINE_RESET(eolith); DECLARE_VIDEO_START(eolith); + UINT32 screen_update_eolith(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/eolith.c -----------*/ -SCREEN_UPDATE_IND16( eolith ); + diff --git a/src/mame/includes/epos.h b/src/mame/includes/epos.h index 7f89328ca2b..d489dc98c82 100644 --- a/src/mame/includes/epos.h +++ b/src/mame/includes/epos.h @@ -26,9 +26,10 @@ public: virtual void machine_reset(); DECLARE_MACHINE_START(epos); DECLARE_MACHINE_START(dealer); + UINT32 screen_update_epos(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/epos.c -----------*/ -SCREEN_UPDATE_RGB32( epos ); + diff --git a/src/mame/includes/eprom.h b/src/mame/includes/eprom.h index 500bde3bd83..ea6b4622796 100644 --- a/src/mame/includes/eprom.h +++ b/src/mame/includes/eprom.h @@ -31,15 +31,17 @@ public: DECLARE_MACHINE_RESET(eprom); DECLARE_VIDEO_START(eprom); DECLARE_VIDEO_START(guts); + UINT32 screen_update_eprom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_guts(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/eprom.c -----------*/ -SCREEN_UPDATE_IND16( eprom ); -SCREEN_UPDATE_IND16( guts ); + + void eprom_scanline_update(screen_device &screen, int scanline); diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h index b2a5cf18c6a..06585af25ce 100644 --- a/src/mame/includes/equites.h +++ b/src/mame/includes/equites.h @@ -104,6 +104,8 @@ public: DECLARE_PALETTE_INIT(equites); DECLARE_VIDEO_START(splndrbt); DECLARE_PALETTE_INIT(splndrbt); + UINT32 screen_update_equites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_splndrbt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h index 58a0090a4e5..f6d5ee36483 100644 --- a/src/mame/includes/esd16.h +++ b/src/mame/includes/esd16.h @@ -63,6 +63,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_hedpanic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -70,4 +71,4 @@ public: -SCREEN_UPDATE_IND16( hedpanic ); + diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h index a4852fe86e0..40bdc03a954 100644 --- a/src/mame/includes/espial.h +++ b/src/mame/includes/espial.h @@ -51,6 +51,7 @@ public: virtual void video_start(); virtual void palette_init(); DECLARE_VIDEO_START(netwars); + UINT32 screen_update_espial(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/espial.c -----------*/ @@ -58,4 +59,4 @@ public: -SCREEN_UPDATE_IND16( espial ); + diff --git a/src/mame/includes/esripsys.h b/src/mame/includes/esripsys.h index 3cf65ccb32d..17de16c2ec9 100644 --- a/src/mame/includes/esripsys.h +++ b/src/mame/includes/esripsys.h @@ -92,13 +92,14 @@ public: DECLARE_WRITE8_MEMBER(esripsys_dac_w); DECLARE_DRIVER_INIT(esripsys); virtual void video_start(); + UINT32 screen_update_esripsys(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/esripsys.c -----------*/ -SCREEN_UPDATE_RGB32( esripsys ); + INTERRUPT_GEN( esripsys_vblank_irq ); diff --git a/src/mame/includes/exedexes.h b/src/mame/includes/exedexes.h index f0a1f90e2c6..90faf2c9bc5 100644 --- a/src/mame/includes/exedexes.h +++ b/src/mame/includes/exedexes.h @@ -48,6 +48,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_exedexes(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/exerion.h b/src/mame/includes/exerion.h index c109b417cdc..b13383daf70 100644 --- a/src/mame/includes/exerion.h +++ b/src/mame/includes/exerion.h @@ -61,6 +61,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_exerion(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -69,5 +70,5 @@ public: -SCREEN_UPDATE_IND16( exerion ); + diff --git a/src/mame/includes/exidy.h b/src/mame/includes/exidy.h index 7130bdb38dd..1db5e4ca4d5 100644 --- a/src/mame/includes/exidy.h +++ b/src/mame/includes/exidy.h @@ -67,6 +67,7 @@ public: DECLARE_DRIVER_INIT(phantoma); virtual void video_start(); DECLARE_MACHINE_START(teetert); + UINT32 screen_update_exidy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -74,7 +75,7 @@ public: void exidy_video_config(running_machine &machine, UINT8 _collision_mask, UINT8 _collision_invert, int _is_2bpp); -SCREEN_UPDATE_IND16( exidy ); + INTERRUPT_GEN( exidy_vblank_interrupt ); diff --git a/src/mame/includes/exidy440.h b/src/mame/includes/exidy440.h index e708c691720..d2f58655a75 100644 --- a/src/mame/includes/exidy440.h +++ b/src/mame/includes/exidy440.h @@ -67,6 +67,8 @@ public: virtual void machine_reset(); DECLARE_VIDEO_START(exidy440); DECLARE_VIDEO_START(topsecex); + UINT32 screen_update_exidy440(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_topsecex(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/exprraid.h b/src/mame/includes/exprraid.h index 4368b628a81..1e65d2cabf0 100644 --- a/src/mame/includes/exprraid.h +++ b/src/mame/includes/exprraid.h @@ -53,6 +53,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_exprraid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/exzisus.h b/src/mame/includes/exzisus.h index 68540c6cdad..c8e0a8ccf4a 100644 --- a/src/mame/includes/exzisus.h +++ b/src/mame/includes/exzisus.h @@ -36,12 +36,13 @@ public: DECLARE_WRITE8_MEMBER(exzisus_videoram_1_w); DECLARE_WRITE8_MEMBER(exzisus_objectram_0_w); DECLARE_WRITE8_MEMBER(exzisus_objectram_1_w); + UINT32 screen_update_exzisus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/exzisus.c -----------*/ -SCREEN_UPDATE_IND16( exzisus ); + diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h index 5b7dbecf845..1cb3ab86edb 100644 --- a/src/mame/includes/f1gp.h +++ b/src/mame/includes/f1gp.h @@ -73,6 +73,9 @@ public: DECLARE_MACHINE_START(f1gpb); DECLARE_VIDEO_START(f1gpb); DECLARE_VIDEO_START(f1gp2); + UINT32 screen_update_f1gp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_f1gpb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_f1gp2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/f1gp.c -----------*/ @@ -81,6 +84,6 @@ public: -SCREEN_UPDATE_IND16( f1gp ); -SCREEN_UPDATE_IND16( f1gpb ); -SCREEN_UPDATE_IND16( f1gp2 ); + + + diff --git a/src/mame/includes/fantland.h b/src/mame/includes/fantland.h index cd7a4ff570c..47e3741e2a7 100644 --- a/src/mame/includes/fantland.h +++ b/src/mame/includes/fantland.h @@ -47,9 +47,10 @@ public: DECLARE_MACHINE_RESET(fantland); DECLARE_MACHINE_START(borntofi); DECLARE_MACHINE_RESET(borntofi); + UINT32 screen_update_fantland(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/fantland.c -----------*/ -SCREEN_UPDATE_IND16( fantland ); + diff --git a/src/mame/includes/fastfred.h b/src/mame/includes/fastfred.h index 3a2cb0e0a89..3f69b31f151 100644 --- a/src/mame/includes/fastfred.h +++ b/src/mame/includes/fastfred.h @@ -61,6 +61,8 @@ public: DECLARE_PALETTE_INIT(fastfred); DECLARE_MACHINE_START(imago); DECLARE_VIDEO_START(imago); + UINT32 screen_update_fastfred(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_imago(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -76,9 +78,9 @@ DECLARE_WRITE8_HANDLER( fastfred_colorbank1_w ); DECLARE_WRITE8_HANDLER( fastfred_colorbank2_w ); DECLARE_WRITE8_HANDLER( fastfred_flip_screen_x_w ); DECLARE_WRITE8_HANDLER( fastfred_flip_screen_y_w ); -SCREEN_UPDATE_IND16( fastfred ); -SCREEN_UPDATE_IND16( imago ); + + DECLARE_WRITE8_HANDLER( imago_fg_videoram_w ); DECLARE_WRITE8_HANDLER( imago_charbank_w ); diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h index fba26616aac..7c11bc40f38 100644 --- a/src/mame/includes/fastlane.h +++ b/src/mame/includes/fastlane.h @@ -48,6 +48,7 @@ public: virtual void machine_start(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_fastlane(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -58,4 +59,4 @@ public: -SCREEN_UPDATE_IND16( fastlane ); + diff --git a/src/mame/includes/fcombat.h b/src/mame/includes/fcombat.h index f8e9c261169..bf73aa31a8e 100644 --- a/src/mame/includes/fcombat.h +++ b/src/mame/includes/fcombat.h @@ -66,6 +66,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_fcombat(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -74,5 +75,5 @@ public: -SCREEN_UPDATE_IND16( fcombat ); + diff --git a/src/mame/includes/fgoal.h b/src/mame/includes/fgoal.h index a4a239c4549..b4a4461aac5 100644 --- a/src/mame/includes/fgoal.h +++ b/src/mame/includes/fgoal.h @@ -46,12 +46,13 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_fgoal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/fgoal.c -----------*/ -SCREEN_UPDATE_IND16( fgoal ); + diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h index 1ea3aee2a33..a6fb5283c8e 100644 --- a/src/mame/includes/finalizr.h +++ b/src/mame/includes/finalizr.h @@ -53,6 +53,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_finalizr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -61,4 +62,4 @@ public: -SCREEN_UPDATE_IND16( finalizr ); + diff --git a/src/mame/includes/firetrap.h b/src/mame/includes/firetrap.h index 87f62f5f14f..11e679b12d7 100644 --- a/src/mame/includes/firetrap.h +++ b/src/mame/includes/firetrap.h @@ -70,6 +70,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_firetrap(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -78,4 +79,4 @@ public: -SCREEN_UPDATE_IND16( firetrap ); + diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h index 51c903f1a6e..caa52b4253e 100644 --- a/src/mame/includes/firetrk.h +++ b/src/mame/includes/firetrk.h @@ -101,6 +101,9 @@ public: DECLARE_VIDEO_START(superbug); DECLARE_VIDEO_START(montecar); DECLARE_PALETTE_INIT(montecar); + UINT32 screen_update_firetrk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_superbug(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_montecar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -126,8 +129,8 @@ DISCRETE_SOUND_EXTERN( montecar ); -SCREEN_UPDATE_IND16( firetrk ); -SCREEN_UPDATE_IND16( superbug ); -SCREEN_UPDATE_IND16( montecar ); + + + diff --git a/src/mame/includes/fitfight.h b/src/mame/includes/fitfight.h index 8b77faa2d47..ffc1892c961 100644 --- a/src/mame/includes/fitfight.h +++ b/src/mame/includes/fitfight.h @@ -61,6 +61,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_fitfight(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -68,4 +69,4 @@ public: -SCREEN_UPDATE_IND16(fitfight); + diff --git a/src/mame/includes/flkatck.h b/src/mame/includes/flkatck.h index 73077ee489a..ab251c1648f 100644 --- a/src/mame/includes/flkatck.h +++ b/src/mame/includes/flkatck.h @@ -38,6 +38,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_flkatck(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -48,4 +49,4 @@ public: -SCREEN_UPDATE_IND16( flkatck ); + diff --git a/src/mame/includes/flower.h b/src/mame/includes/flower.h index b8e94b62426..74c25c3e90d 100644 --- a/src/mame/includes/flower.h +++ b/src/mame/includes/flower.h @@ -40,6 +40,7 @@ public: TILE_GET_INFO_MEMBER(get_text_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_flower(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -77,6 +78,6 @@ extern const device_type FLOWER; /*----------- defined in video/flower.c -----------*/ -SCREEN_UPDATE_IND16( flower ); + diff --git a/src/mame/includes/flstory.h b/src/mame/includes/flstory.h index 7736a4963a5..f0c94bd769b 100644 --- a/src/mame/includes/flstory.h +++ b/src/mame/includes/flstory.h @@ -114,6 +114,9 @@ public: DECLARE_MACHINE_RESET(rumba); DECLARE_VIDEO_START(rumba); DECLARE_MACHINE_RESET(ta7630); + UINT32 screen_update_flstory(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_victnine(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_rumba(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -124,9 +127,9 @@ public: /*----------- defined in video/flstory.c -----------*/ -SCREEN_UPDATE_IND16( flstory ); -SCREEN_UPDATE_IND16( victnine ); -SCREEN_UPDATE_IND16( rumba ); + + + diff --git a/src/mame/includes/foodf.h b/src/mame/includes/foodf.h index 5e18a461772..315e6a55362 100644 --- a/src/mame/includes/foodf.h +++ b/src/mame/includes/foodf.h @@ -35,10 +35,11 @@ public: DECLARE_MACHINE_START(foodf); DECLARE_MACHINE_RESET(foodf); DECLARE_VIDEO_START(foodf); + UINT32 screen_update_foodf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/foodf.c -----------*/ -SCREEN_UPDATE_IND16( foodf ); + diff --git a/src/mame/includes/freekick.h b/src/mame/includes/freekick.h index bf316121ea2..1e173cc5ed8 100644 --- a/src/mame/includes/freekick.h +++ b/src/mame/includes/freekick.h @@ -48,12 +48,15 @@ public: DECLARE_MACHINE_START(freekick); DECLARE_MACHINE_START(oigas); DECLARE_MACHINE_RESET(oigas); + UINT32 screen_update_pbillrd(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_freekick(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_gigas(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/freekick.c -----------*/ -SCREEN_UPDATE_IND16(gigas); -SCREEN_UPDATE_IND16(pbillrd); -SCREEN_UPDATE_IND16(freekick); + + + diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h index 011f12e54b1..c06499855dd 100644 --- a/src/mame/includes/fromanc2.h +++ b/src/mame/includes/fromanc2.h @@ -103,6 +103,8 @@ public: DECLARE_VIDEO_START(fromancr); DECLARE_MACHINE_START(fromanc4); DECLARE_VIDEO_START(fromanc4); + UINT32 screen_update_fromanc2_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_fromanc2_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -110,8 +112,8 @@ public: /*----------- defined in video/fromanc2.c -----------*/ -SCREEN_UPDATE_IND16( fromanc2_left ); -SCREEN_UPDATE_IND16( fromanc2_right ); + + diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h index c04f17ab586..aafc12784dc 100644 --- a/src/mame/includes/fromance.h +++ b/src/mame/includes/fromance.h @@ -84,6 +84,8 @@ public: DECLARE_MACHINE_RESET(pipedrm); DECLARE_VIDEO_START(pipedrm); DECLARE_VIDEO_START(hatris); + UINT32 screen_update_fromance(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_pipedrm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -93,8 +95,8 @@ public: -SCREEN_UPDATE_IND16( fromance ); -SCREEN_UPDATE_IND16( pipedrm ); + + diff --git a/src/mame/includes/funkybee.h b/src/mame/includes/funkybee.h index 01982f7c969..d4108c8f760 100644 --- a/src/mame/includes/funkybee.h +++ b/src/mame/includes/funkybee.h @@ -28,6 +28,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_funkybee(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -36,4 +37,4 @@ public: -SCREEN_UPDATE_IND16( funkybee ); + diff --git a/src/mame/includes/funkyjet.h b/src/mame/includes/funkyjet.h index 0fba2b1b57d..61f2031ad60 100644 --- a/src/mame/includes/funkyjet.h +++ b/src/mame/includes/funkyjet.h @@ -25,10 +25,11 @@ public: device_t *m_deco_tilegen1; DECLARE_DRIVER_INIT(funkyjet); virtual void machine_start(); + UINT32 screen_update_funkyjet(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/funkyjet.c -----------*/ -SCREEN_UPDATE_IND16( funkyjet ); + diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h index eae6578398e..646bfc93d7d 100644 --- a/src/mame/includes/funworld.h +++ b/src/mame/includes/funworld.h @@ -29,6 +29,7 @@ public: DECLARE_VIDEO_START(funworld); DECLARE_PALETTE_INIT(funworld); DECLARE_VIDEO_START(magicrd2); + UINT32 screen_update_funworld(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -37,4 +38,4 @@ public: -SCREEN_UPDATE_IND16( funworld ); + diff --git a/src/mame/includes/funybubl.h b/src/mame/includes/funybubl.h index 1385c90d680..b88b0b4d449 100644 --- a/src/mame/includes/funybubl.h +++ b/src/mame/includes/funybubl.h @@ -22,6 +22,7 @@ public: DECLARE_WRITE8_MEMBER(funybubl_oki_bank_sw); virtual void machine_start(); virtual void video_start(); + UINT32 screen_update_funybubl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -30,4 +31,4 @@ public: -SCREEN_UPDATE_IND16(funybubl); + diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h index af7d9b01023..f47bd99406e 100644 --- a/src/mame/includes/fuukifg2.h +++ b/src/mame/includes/fuukifg2.h @@ -43,6 +43,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_fuuki16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -50,4 +51,4 @@ public: -SCREEN_UPDATE_IND16( fuuki16 ); + diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h index ff7e607eb49..e55a110b7e6 100644 --- a/src/mame/includes/fuukifg3.h +++ b/src/mame/includes/fuukifg3.h @@ -61,6 +61,8 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_fuuki32(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_fuuki32(screen_device &screen, bool state); }; @@ -68,5 +70,5 @@ public: -SCREEN_UPDATE_IND16( fuuki32 ); -SCREEN_VBLANK( fuuki32 ); + + diff --git a/src/mame/includes/gaelco.h b/src/mame/includes/gaelco.h index e43d8fca7cd..62806b5745f 100644 --- a/src/mame/includes/gaelco.h +++ b/src/mame/includes/gaelco.h @@ -39,6 +39,8 @@ public: virtual void machine_start(); DECLARE_VIDEO_START(bigkarnk); DECLARE_VIDEO_START(maniacsq); + UINT32 screen_update_bigkarnk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_maniacsq(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -49,5 +51,5 @@ public: -SCREEN_UPDATE_IND16( bigkarnk ); -SCREEN_UPDATE_IND16( maniacsq ); + + diff --git a/src/mame/includes/gaelco2.h b/src/mame/includes/gaelco2.h index 358ed77695d..0c05279d684 100644 --- a/src/mame/includes/gaelco2.h +++ b/src/mame/includes/gaelco2.h @@ -49,6 +49,9 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_gaelco2_screen1_dual); DECLARE_VIDEO_START(gaelco2); DECLARE_VIDEO_START(gaelco2_dual); + UINT32 screen_update_gaelco2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_gaelco2_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_gaelco2_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -61,8 +64,8 @@ DECLARE_WRITE16_DEVICE_HANDLER( gaelco2_eeprom_data_w ); /*----------- defined in video/gaelco2.c -----------*/ -SCREEN_UPDATE_IND16( gaelco2 ); -SCREEN_UPDATE_IND16( gaelco2_left ); -SCREEN_UPDATE_IND16( gaelco2_right ); + + + diff --git a/src/mame/includes/gaelco3d.h b/src/mame/includes/gaelco3d.h index 2efeb54723f..da556145f7e 100644 --- a/src/mame/includes/gaelco3d.h +++ b/src/mame/includes/gaelco3d.h @@ -115,6 +115,7 @@ public: virtual void video_start(); DECLARE_MACHINE_RESET(gaelco3d2); DECLARE_MACHINE_RESET(common); + UINT32 screen_update_gaelco3d(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -124,4 +125,4 @@ void gaelco3d_render(screen_device &screen); -SCREEN_UPDATE_IND16( gaelco3d ); + diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h index 08e7363ca20..aa6c8e16ce0 100644 --- a/src/mame/includes/gaiden.h +++ b/src/mame/includes/gaiden.h @@ -83,6 +83,9 @@ public: DECLARE_VIDEO_START(drgnbowl); DECLARE_VIDEO_START(mastninj); DECLARE_VIDEO_START(raiga); + UINT32 screen_update_gaiden(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_drgnbowl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_raiga(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -93,8 +96,8 @@ public: -SCREEN_UPDATE_RGB32( gaiden ); -SCREEN_UPDATE_RGB32( raiga ); -SCREEN_UPDATE_IND16( drgnbowl ); + + + diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h index 4bd5bf72610..b3d9e90e30a 100644 --- a/src/mame/includes/galaga.h +++ b/src/mame/includes/galaga.h @@ -56,6 +56,8 @@ public: DECLARE_MACHINE_RESET(galaga); DECLARE_VIDEO_START(galaga); DECLARE_PALETTE_INIT(galaga); + UINT32 screen_update_galaga(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_galaga(screen_device &screen, bool state); }; class xevious_state : public galaga_state @@ -90,6 +92,7 @@ public: DECLARE_MACHINE_RESET(xevios); DECLARE_PALETTE_INIT(battles); DECLARE_MACHINE_RESET(battles); + UINT32 screen_update_xevious(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -119,6 +122,8 @@ public: TILE_GET_INFO_MEMBER(fg_get_tile_info); DECLARE_VIDEO_START(bosco); DECLARE_PALETTE_INIT(bosco); + UINT32 screen_update_bosco(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_bosco(screen_device &screen, bool state); }; class digdug_state : public galaga_state @@ -144,6 +149,7 @@ public: TILE_GET_INFO_MEMBER(tx_get_tile_info); DECLARE_VIDEO_START(digdug); DECLARE_PALETTE_INIT(digdug); + UINT32 screen_update_digdug(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -155,10 +161,6 @@ DECLARE_WRITE8_HANDLER( bosco_scrollx_w ); DECLARE_WRITE8_HANDLER( bosco_scrolly_w ); DECLARE_WRITE8_HANDLER( bosco_starclr_w ); -SCREEN_UPDATE_IND16( bosco ); - -SCREEN_VBLANK( bosco ); /* update starfield */ - /*----------- defined in audio/galaga.c -----------*/ DISCRETE_SOUND_EXTERN( bosco ); @@ -175,11 +177,6 @@ struct star extern const struct star star_seed_tab[]; - - -SCREEN_UPDATE_IND16( galaga ); -SCREEN_VBLANK( galaga ); /* update starfield */ - /*----------- defined in video/xevious.c -----------*/ DECLARE_WRITE8_HANDLER( xevious_fg_videoram_w ); @@ -191,7 +188,7 @@ DECLARE_WRITE8_HANDLER( xevious_bs_w ); DECLARE_READ8_HANDLER( xevious_bb_r ); -SCREEN_UPDATE_IND16( xevious ); + @@ -220,5 +217,5 @@ INTERRUPT_GEN( battles_interrupt_4 ); DECLARE_WRITE8_HANDLER( digdug_videoram_w ); DECLARE_WRITE8_HANDLER( digdug_PORT_w ); -SCREEN_UPDATE_IND16( digdug ); + diff --git a/src/mame/includes/galastrm.h b/src/mame/includes/galastrm.h index a6ef24ac06e..fdfdfe2c818 100644 --- a/src/mame/includes/galastrm.h +++ b/src/mame/includes/galastrm.h @@ -47,10 +47,11 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(frame_counter_r); DECLARE_CUSTOM_INPUT_MEMBER(coin_word_r); virtual void video_start(); + UINT32 screen_update_galastrm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/galastrm.c -----------*/ -SCREEN_UPDATE_IND16( galastrm ); + diff --git a/src/mame/includes/galaxia.h b/src/mame/includes/galaxia.h index e613ac17bdf..f3cf4c73dd1 100644 --- a/src/mame/includes/galaxia.h +++ b/src/mame/includes/galaxia.h @@ -26,6 +26,8 @@ public: DECLARE_PALETTE_INIT(galaxia); DECLARE_VIDEO_START(astrowar); DECLARE_PALETTE_INIT(astrowar); + UINT32 screen_update_galaxia(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_astrowar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -36,5 +38,5 @@ public: -SCREEN_UPDATE_IND16( galaxia ); -SCREEN_UPDATE_IND16( astrowar ); + + diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h index 2b131fbfdcc..9bfa73d5e82 100644 --- a/src/mame/includes/galaxian.h +++ b/src/mame/includes/galaxian.h @@ -223,6 +223,7 @@ public: virtual void palette_init(); DECLARE_PALETTE_INIT(moonwar); void tenspot_set_game_bank(running_machine& machine, int bank, int from_game); + UINT32 screen_update_galaxian(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -232,7 +233,7 @@ public: -SCREEN_UPDATE_RGB32( galaxian ); + diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h index 83123ff1ba9..7284c6504b1 100644 --- a/src/mame/includes/galaxold.h +++ b/src/mame/includes/galaxold.h @@ -176,6 +176,8 @@ public: DECLARE_VIDEO_START(scorpion); DECLARE_VIDEO_START(ad2083); DECLARE_VIDEO_START(dambustr); + UINT32 screen_update_galaxold(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_dambustr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -222,8 +224,8 @@ public: void galaxold_init_stars(running_machine &machine, int colors_offset); void galaxold_draw_stars(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect); -SCREEN_UPDATE_IND16( galaxold ); -SCREEN_UPDATE_IND16( dambustr ); + + diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h index 7c9bb038bd5..680ccb1fb09 100644 --- a/src/mame/includes/galivan.h +++ b/src/mame/includes/galivan.h @@ -56,6 +56,8 @@ public: DECLARE_MACHINE_START(ninjemak); DECLARE_MACHINE_RESET(ninjemak); DECLARE_VIDEO_START(ninjemak); + UINT32 screen_update_galivan(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_ninjemak(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -69,5 +71,5 @@ DECLARE_WRITE8_HANDLER( ninjemak_scrolly_w ); -SCREEN_UPDATE_IND16( galivan ); -SCREEN_UPDATE_IND16( ninjemak ); + + diff --git a/src/mame/includes/galpani2.h b/src/mame/includes/galpani2.h index b23c49079a7..26a57955445 100644 --- a/src/mame/includes/galpani2.h +++ b/src/mame/includes/galpani2.h @@ -50,6 +50,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_galpani2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -57,7 +58,7 @@ public: -SCREEN_UPDATE_IND16( galpani2 ); + DECLARE_WRITE16_HANDLER( galpani2_palette_0_w ); DECLARE_WRITE16_HANDLER( galpani2_palette_1_w ); diff --git a/src/mame/includes/galpanic.h b/src/mame/includes/galpanic.h index 1ba86bee9a9..1854f17a005 100644 --- a/src/mame/includes/galpanic.h +++ b/src/mame/includes/galpanic.h @@ -24,6 +24,9 @@ public: DECLARE_READ8_MEMBER(comad_okim6295_r); DECLARE_VIDEO_START(galpanic); DECLARE_PALETTE_INIT(galpanic); + UINT32 screen_update_galpanic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_comad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_galpanic(screen_device &screen, bool state); }; @@ -33,7 +36,7 @@ public: DECLARE_WRITE16_HANDLER( galpanic_bgvideoram_w ); DECLARE_WRITE16_HANDLER( galpanic_paletteram_w ); -SCREEN_UPDATE_IND16( galpanic ); -SCREEN_UPDATE_IND16( comad ); + + diff --git a/src/mame/includes/galspnbl.h b/src/mame/includes/galspnbl.h index 4474fe42b39..a28209a7140 100644 --- a/src/mame/includes/galspnbl.h +++ b/src/mame/includes/galspnbl.h @@ -29,6 +29,7 @@ public: DECLARE_WRITE16_MEMBER(soundcommand_w); virtual void machine_start(); virtual void palette_init(); + UINT32 screen_update_galspnbl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -36,4 +37,4 @@ public: -SCREEN_UPDATE_IND16( galspnbl ); + diff --git a/src/mame/includes/gameplan.h b/src/mame/includes/gameplan.h index c44d13a4826..0506fe6e044 100644 --- a/src/mame/includes/gameplan.h +++ b/src/mame/includes/gameplan.h @@ -68,6 +68,8 @@ public: DECLARE_VIDEO_START(leprechn); DECLARE_VIDEO_START(trvquest); DECLARE_VIDEO_START(common); + UINT32 screen_update_gameplan(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_leprechn(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h index 654fe521df1..4f8e6b92715 100644 --- a/src/mame/includes/gaplus.h +++ b/src/mame/includes/gaplus.h @@ -45,16 +45,6 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_gaplus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_gaplus(screen_device &screen, bool state); }; - - -/*----------- defined in machine/gaplus.c -----------*/ - - - -/*----------- defined in video/gaplus.c -----------*/ - - - -SCREEN_UPDATE_IND16( gaplus ); -SCREEN_VBLANK( gaplus ); /* update starfields */ diff --git a/src/mame/includes/gatron.h b/src/mame/includes/gatron.h index cb9112ad92d..83e05d07857 100644 --- a/src/mame/includes/gatron.h +++ b/src/mame/includes/gatron.h @@ -13,6 +13,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_gat(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -20,5 +21,5 @@ public: -SCREEN_UPDATE_IND16( gat ); + diff --git a/src/mame/includes/gauntlet.h b/src/mame/includes/gauntlet.h index ce70eb66876..8bf9988e628 100644 --- a/src/mame/includes/gauntlet.h +++ b/src/mame/includes/gauntlet.h @@ -30,6 +30,7 @@ public: DECLARE_MACHINE_START(gauntlet); DECLARE_MACHINE_RESET(gauntlet); DECLARE_VIDEO_START(gauntlet); + UINT32 screen_update_gauntlet(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -39,4 +40,4 @@ DECLARE_WRITE16_HANDLER( gauntlet_xscroll_w ); DECLARE_WRITE16_HANDLER( gauntlet_yscroll_w ); -SCREEN_UPDATE_IND16( gauntlet ); + diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h index 6734ee77b53..887a7ad66d5 100644 --- a/src/mame/includes/gberet.h +++ b/src/mame/includes/gberet.h @@ -55,6 +55,8 @@ public: DECLARE_MACHINE_RESET(gberet); DECLARE_VIDEO_START(gberet); DECLARE_PALETTE_INIT(gberet); + UINT32 screen_update_gberet(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_gberetb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -63,5 +65,5 @@ public: -SCREEN_UPDATE_IND16( gberet ); -SCREEN_UPDATE_IND16( gberetb ); + + diff --git a/src/mame/includes/gbusters.h b/src/mame/includes/gbusters.h index a213322029e..c979bf11797 100644 --- a/src/mame/includes/gbusters.h +++ b/src/mame/includes/gbusters.h @@ -40,6 +40,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_gbusters(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/gbusters.c -----------*/ @@ -48,4 +49,4 @@ extern void gbusters_tile_callback(running_machine &machine, int layer,int bank, extern void gbusters_sprite_callback(running_machine &machine, int *code,int *color,int *priority,int *shadow); -SCREEN_UPDATE_IND16( gbusters ); + diff --git a/src/mame/includes/gcpinbal.h b/src/mame/includes/gcpinbal.h index 1acbad10df1..539746cebc5 100644 --- a/src/mame/includes/gcpinbal.h +++ b/src/mame/includes/gcpinbal.h @@ -58,11 +58,12 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_gcpinbal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/gcpinbal.c -----------*/ -SCREEN_UPDATE_IND16( gcpinbal ); + diff --git a/src/mame/includes/gijoe.h b/src/mame/includes/gijoe.h index 12e9803360b..5359da0becc 100644 --- a/src/mame/includes/gijoe.h +++ b/src/mame/includes/gijoe.h @@ -44,6 +44,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_gijoe(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/gijoe.c -----------*/ @@ -52,4 +53,4 @@ extern void gijoe_sprite_callback(running_machine &machine, int *code, int *colo extern void gijoe_tile_callback(running_machine &machine, int layer, int *code, int *color, int *flags); -SCREEN_UPDATE_IND16( gijoe ); + diff --git a/src/mame/includes/ginganin.h b/src/mame/includes/ginganin.h index ebf9d09962e..85a9ea9f618 100644 --- a/src/mame/includes/ginganin.h +++ b/src/mame/includes/ginganin.h @@ -45,6 +45,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_ginganin(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -53,4 +54,4 @@ public: -SCREEN_UPDATE_IND16( ginganin ); + diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h index 75faf3e3291..be575bef0b2 100644 --- a/src/mame/includes/gladiatr.h +++ b/src/mame/includes/gladiatr.h @@ -64,11 +64,13 @@ public: DECLARE_VIDEO_START(ppking); DECLARE_MACHINE_RESET(gladiator); DECLARE_VIDEO_START(gladiatr); + UINT32 screen_update_ppking(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_gladiatr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/gladiatr.c -----------*/ -SCREEN_UPDATE_IND16( ppking ); -SCREEN_UPDATE_IND16( gladiatr ); + + diff --git a/src/mame/includes/glass.h b/src/mame/includes/glass.h index 276d6abb848..5534276819c 100644 --- a/src/mame/includes/glass.h +++ b/src/mame/includes/glass.h @@ -46,6 +46,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_glass(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -53,4 +54,4 @@ public: -SCREEN_UPDATE_IND16( glass ); + diff --git a/src/mame/includes/gng.h b/src/mame/includes/gng.h index 46462a65cac..0b6da744586 100644 --- a/src/mame/includes/gng.h +++ b/src/mame/includes/gng.h @@ -42,6 +42,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_gng(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -49,4 +50,4 @@ public: -SCREEN_UPDATE_IND16( gng ); + diff --git a/src/mame/includes/goal92.h b/src/mame/includes/goal92.h index 26e70ae57bb..8e71a631bdf 100644 --- a/src/mame/includes/goal92.h +++ b/src/mame/includes/goal92.h @@ -51,6 +51,8 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_goal92(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_goal92(screen_device &screen, bool state); }; @@ -61,5 +63,5 @@ public: -SCREEN_UPDATE_IND16( goal92 ); -SCREEN_VBLANK( goal92 ); + + diff --git a/src/mame/includes/goindol.h b/src/mame/includes/goindol.h index 846adef7b11..fdd3a18c448 100644 --- a/src/mame/includes/goindol.h +++ b/src/mame/includes/goindol.h @@ -47,6 +47,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_goindol(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -55,4 +56,4 @@ public: -SCREEN_UPDATE_IND16( goindol ); + diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h index 3e376fa3995..57228682840 100644 --- a/src/mame/includes/goldstar.h +++ b/src/mame/includes/goldstar.h @@ -141,6 +141,12 @@ public: DECLARE_VIDEO_START(magical); DECLARE_PALETTE_INIT(magodds); DECLARE_VIDEO_START(unkch); + UINT32 screen_update_goldstar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_cmast91(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_bingowng(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_magical(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_amcoe1a(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_unkch(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -154,9 +160,9 @@ public: -SCREEN_UPDATE_IND16( goldstar ); -SCREEN_UPDATE_IND16( bingowng ); -SCREEN_UPDATE_IND16( cmast91 ); -SCREEN_UPDATE_IND16( amcoe1a ); -SCREEN_UPDATE_IND16( unkch ); -SCREEN_UPDATE_IND16( magical ); + + + + + + diff --git a/src/mame/includes/gomoku.h b/src/mame/includes/gomoku.h index 2653eac0bc8..1e58bcacc46 100644 --- a/src/mame/includes/gomoku.h +++ b/src/mame/includes/gomoku.h @@ -25,6 +25,7 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_gomoku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -62,5 +63,5 @@ extern const device_type GOMOKU; -SCREEN_UPDATE_IND16( gomoku ); + diff --git a/src/mame/includes/gotcha.h b/src/mame/includes/gotcha.h index 700adde88db..e77260fd47a 100644 --- a/src/mame/includes/gotcha.h +++ b/src/mame/includes/gotcha.h @@ -41,6 +41,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_gotcha(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -48,5 +49,5 @@ public: -SCREEN_UPDATE_IND16( gotcha ); + diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h index e851eb9c80c..de68c7124bc 100644 --- a/src/mame/includes/gottlieb.h +++ b/src/mame/includes/gottlieb.h @@ -301,6 +301,7 @@ public: virtual void machine_reset(); virtual void video_start(); DECLARE_VIDEO_START(screwloo); + UINT32 screen_update_gottlieb(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -309,7 +310,7 @@ public: -SCREEN_UPDATE_RGB32( gottlieb ); + #if USE_FAKE_VOTRAX MACHINE_CONFIG_EXTERN( reactor_samples ); diff --git a/src/mame/includes/gotya.h b/src/mame/includes/gotya.h index fc92059c0d5..d77f58e5a35 100644 --- a/src/mame/includes/gotya.h +++ b/src/mame/includes/gotya.h @@ -37,6 +37,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_gotya(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -49,4 +50,4 @@ public: -SCREEN_UPDATE_IND16( gotya ); + diff --git a/src/mame/includes/gradius3.h b/src/mame/includes/gradius3.h index 7e75c797905..c4703844313 100644 --- a/src/mame/includes/gradius3.h +++ b/src/mame/includes/gradius3.h @@ -48,6 +48,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_gradius3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/gradius3.c -----------*/ @@ -57,4 +58,4 @@ extern void gradius3_tile_callback(running_machine &machine, int layer,int bank, -SCREEN_UPDATE_IND16( gradius3 ); + diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h index 4aef969b861..9bac935bdc8 100644 --- a/src/mame/includes/grchamp.h +++ b/src/mame/includes/grchamp.h @@ -71,6 +71,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_grchamp(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /* Discrete Sound Input Nodes */ @@ -92,4 +93,4 @@ DISCRETE_SOUND_EXTERN( grchamp ); -SCREEN_UPDATE_RGB32( grchamp ); + diff --git a/src/mame/includes/gridlee.h b/src/mame/includes/gridlee.h index 5e9e83e48ae..fb1a9e19edd 100644 --- a/src/mame/includes/gridlee.h +++ b/src/mame/includes/gridlee.h @@ -55,6 +55,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_gridlee(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -93,5 +94,5 @@ extern const device_type GRIDLEE; -SCREEN_UPDATE_IND16( gridlee ); + diff --git a/src/mame/includes/groundfx.h b/src/mame/includes/groundfx.h index 0edd1b04747..fee422925a6 100644 --- a/src/mame/includes/groundfx.h +++ b/src/mame/includes/groundfx.h @@ -37,10 +37,11 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(coin_word_r); DECLARE_DRIVER_INIT(groundfx); virtual void video_start(); + UINT32 screen_update_groundfx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/groundfx.c -----------*/ -SCREEN_UPDATE_IND16( groundfx ); + diff --git a/src/mame/includes/gstriker.h b/src/mame/includes/gstriker.h index 01f3c225519..092c37da17a 100644 --- a/src/mame/includes/gstriker.h +++ b/src/mame/includes/gstriker.h @@ -104,13 +104,14 @@ public: DECLARE_VIDEO_START(gstriker); DECLARE_VIDEO_START(vgoalsoc); DECLARE_VIDEO_START(twrldc94); + UINT32 screen_update_gstriker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/gstriker.c -----------*/ -SCREEN_UPDATE_IND16( gstriker ); + diff --git a/src/mame/includes/gsword.h b/src/mame/includes/gsword.h index 8ad28f5dddf..ce297799232 100644 --- a/src/mame/includes/gsword.h +++ b/src/mame/includes/gsword.h @@ -45,6 +45,7 @@ public: DECLARE_PALETTE_INIT(gsword); DECLARE_MACHINE_RESET(josvolly); DECLARE_PALETTE_INIT(josvolly); + UINT32 screen_update_gsword(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -54,4 +55,4 @@ public: -SCREEN_UPDATE_IND16( gsword ); + diff --git a/src/mame/includes/gumbo.h b/src/mame/includes/gumbo.h index a8cc7f7f251..ec78e345f7e 100644 --- a/src/mame/includes/gumbo.h +++ b/src/mame/includes/gumbo.h @@ -25,6 +25,7 @@ public: TILE_GET_INFO_MEMBER(get_gumbo_bg_tile_info); TILE_GET_INFO_MEMBER(get_gumbo_fg_tile_info); virtual void video_start(); + UINT32 screen_update_gumbo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -32,4 +33,4 @@ public: -SCREEN_UPDATE_IND16( gumbo ); + diff --git a/src/mame/includes/gunbustr.h b/src/mame/includes/gunbustr.h index 00adcc7731f..de582ca68a2 100644 --- a/src/mame/includes/gunbustr.h +++ b/src/mame/includes/gunbustr.h @@ -39,10 +39,11 @@ public: DECLARE_DRIVER_INIT(gunbustrj); DECLARE_DRIVER_INIT(gunbustr); virtual void video_start(); + UINT32 screen_update_gunbustr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/gunbustr.c -----------*/ -SCREEN_UPDATE_IND16( gunbustr ); + diff --git a/src/mame/includes/gundealr.h b/src/mame/includes/gundealr.h index 64863066691..86a1f44bb04 100644 --- a/src/mame/includes/gundealr.h +++ b/src/mame/includes/gundealr.h @@ -41,6 +41,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_gundealr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -48,5 +49,5 @@ public: /*----------- defined in video/gundealr.c -----------*/ -SCREEN_UPDATE_IND16( gundealr ); + diff --git a/src/mame/includes/gunsmoke.h b/src/mame/includes/gunsmoke.h index 6f34b101179..5b59db0f49f 100644 --- a/src/mame/includes/gunsmoke.h +++ b/src/mame/includes/gunsmoke.h @@ -40,6 +40,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_gunsmoke(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -48,5 +49,5 @@ public: -SCREEN_UPDATE_IND16( gunsmoke ); + diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h index b22c9b29620..5953178066f 100644 --- a/src/mame/includes/gyruss.h +++ b/src/mame/includes/gyruss.h @@ -53,6 +53,7 @@ public: virtual void machine_start(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_gyruss(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -60,4 +61,4 @@ public: -SCREEN_UPDATE_IND16( gyruss ); + diff --git a/src/mame/includes/hanaawas.h b/src/mame/includes/hanaawas.h index e09ce719459..fa612049113 100644 --- a/src/mame/includes/hanaawas.h +++ b/src/mame/includes/hanaawas.h @@ -30,6 +30,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_hanaawas(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -39,4 +40,4 @@ DECLARE_WRITE8_DEVICE_HANDLER( hanaawas_portB_w ); -SCREEN_UPDATE_IND16( hanaawas ); + diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h index 0b6e93182b1..d2b73cf8f48 100644 --- a/src/mame/includes/hcastle.h +++ b/src/mame/includes/hcastle.h @@ -55,6 +55,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_hcastle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -62,5 +63,5 @@ public: -SCREEN_UPDATE_IND16( hcastle ); + diff --git a/src/mame/includes/hexion.h b/src/mame/includes/hexion.h index 03e57f27b51..940a7a436c8 100644 --- a/src/mame/includes/hexion.h +++ b/src/mame/includes/hexion.h @@ -22,11 +22,12 @@ public: TILE_GET_INFO_MEMBER(get_tile_info0); TILE_GET_INFO_MEMBER(get_tile_info1); virtual void video_start(); + UINT32 screen_update_hexion(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/hexion.c -----------*/ -SCREEN_UPDATE_IND16( hexion ); + diff --git a/src/mame/includes/higemaru.h b/src/mame/includes/higemaru.h index 9ec141751fb..8c51b0a102c 100644 --- a/src/mame/includes/higemaru.h +++ b/src/mame/includes/higemaru.h @@ -26,6 +26,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_higemaru(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -34,4 +35,4 @@ public: -SCREEN_UPDATE_IND16( higemaru ); + diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h index 19aa31a9735..439558697f0 100644 --- a/src/mame/includes/himesiki.h +++ b/src/mame/includes/himesiki.h @@ -33,11 +33,12 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_himesiki(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/himesiki.c -----------*/ -SCREEN_UPDATE_IND16( himesiki ); + diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h index e648bd2ac3c..ab8c461b60b 100644 --- a/src/mame/includes/hitme.h +++ b/src/mame/includes/hitme.h @@ -39,6 +39,8 @@ public: virtual void machine_reset(); virtual void video_start(); DECLARE_VIDEO_START(barricad); + UINT32 screen_update_hitme(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_barricad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/hnayayoi.h b/src/mame/includes/hnayayoi.h index 7f1df9d738b..2bf521d14e2 100644 --- a/src/mame/includes/hnayayoi.h +++ b/src/mame/includes/hnayayoi.h @@ -36,6 +36,7 @@ public: virtual void machine_reset(); virtual void video_start(); DECLARE_VIDEO_START(untoucha); + UINT32 screen_update_hnayayoi(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -43,5 +44,5 @@ public: -SCREEN_UPDATE_IND16( hnayayoi ); + diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h index 485df979fe7..e240a477be5 100644 --- a/src/mame/includes/hng64.h +++ b/src/mame/includes/hng64.h @@ -186,6 +186,8 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_hng64(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void screen_eof_hng64(screen_device &screen, bool state); }; @@ -194,5 +196,5 @@ public: void hng64_command3d(running_machine& machine, const UINT16* packet); -SCREEN_UPDATE_RGB32( hng64 ); -SCREEN_VBLANK( hng64 ); + + diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h index 5eca165bba8..1582fc34a54 100644 --- a/src/mame/includes/holeland.h +++ b/src/mame/includes/holeland.h @@ -31,6 +31,8 @@ public: TILE_GET_INFO_MEMBER(crzrally_get_tile_info); DECLARE_VIDEO_START(holeland); DECLARE_VIDEO_START(crzrally); + UINT32 screen_update_holeland(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_crzrally(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -38,6 +40,6 @@ public: -SCREEN_UPDATE_IND16( holeland ); -SCREEN_UPDATE_IND16( crzrally ); + + diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h index 38c50b1c169..cb219e74b9a 100644 --- a/src/mame/includes/homedata.h +++ b/src/mame/includes/homedata.h @@ -120,6 +120,11 @@ public: DECLARE_VIDEO_START(mirderby); DECLARE_PALETTE_INIT(mirderby); DECLARE_VIDEO_START(lemnangl); + UINT32 screen_update_mrokumei(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_reikaids(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_pteacher(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_mirderby(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_homedata(screen_device &screen, bool state); }; @@ -137,8 +142,8 @@ public: -SCREEN_UPDATE_IND16( mrokumei ); -SCREEN_UPDATE_IND16( reikaids ); -SCREEN_UPDATE_IND16( pteacher ); -SCREEN_UPDATE_IND16( mirderby ); -SCREEN_VBLANK( homedata ); + + + + + diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h index 2d5a71cbf54..0fb7596f006 100644 --- a/src/mame/includes/homerun.h +++ b/src/mame/includes/homerun.h @@ -52,6 +52,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_homerun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -60,4 +61,4 @@ public: DECLARE_WRITE8_DEVICE_HANDLER( homerun_banking_w ); -SCREEN_UPDATE_IND16(homerun); + diff --git a/src/mame/includes/hyhoo.h b/src/mame/includes/hyhoo.h index 0c143720801..8d10b49a110 100644 --- a/src/mame/includes/hyhoo.h +++ b/src/mame/includes/hyhoo.h @@ -23,11 +23,12 @@ public: DECLARE_DRIVER_INIT(hyhoo2); DECLARE_DRIVER_INIT(hyhoo); virtual void video_start(); + UINT32 screen_update_hyhoo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/hyhoo.c -----------*/ -SCREEN_UPDATE_RGB32( hyhoo ); + diff --git a/src/mame/includes/hyperspt.h b/src/mame/includes/hyperspt.h index f9260d05736..926b0ea1dfd 100644 --- a/src/mame/includes/hyperspt.h +++ b/src/mame/includes/hyperspt.h @@ -42,6 +42,7 @@ public: virtual void video_start(); virtual void palette_init(); DECLARE_VIDEO_START(roadf); + UINT32 screen_update_hyperspt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/hyperspt.c -----------*/ @@ -49,6 +50,6 @@ public: -SCREEN_UPDATE_IND16( hyperspt ); + diff --git a/src/mame/includes/hyprduel.h b/src/mame/includes/hyprduel.h index fc19a9650cf..ef43d56f1ef 100644 --- a/src/mame/includes/hyprduel.h +++ b/src/mame/includes/hyprduel.h @@ -89,6 +89,7 @@ public: DECLARE_MACHINE_START(magerror); DECLARE_VIDEO_START(magerror_14220); DECLARE_VIDEO_START(common_14220); + UINT32 screen_update_hyprduel(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -99,4 +100,4 @@ public: -SCREEN_UPDATE_IND16( hyprduel ); + diff --git a/src/mame/includes/ikki.h b/src/mame/includes/ikki.h index fb1eee520e7..0fb368e0385 100644 --- a/src/mame/includes/ikki.h +++ b/src/mame/includes/ikki.h @@ -35,6 +35,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_ikki(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -43,4 +44,4 @@ public: -SCREEN_UPDATE_IND16( ikki ); + diff --git a/src/mame/includes/inufuku.h b/src/mame/includes/inufuku.h index 76e104a51d5..e672051ed55 100644 --- a/src/mame/includes/inufuku.h +++ b/src/mame/includes/inufuku.h @@ -49,11 +49,12 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_inufuku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/inufuku.c -----------*/ -SCREEN_UPDATE_IND16( inufuku ); + diff --git a/src/mame/includes/iqblock.h b/src/mame/includes/iqblock.h index 081042cec65..66e65ed486f 100644 --- a/src/mame/includes/iqblock.h +++ b/src/mame/includes/iqblock.h @@ -29,6 +29,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); virtual void video_start(); + UINT32 screen_update_iqblock(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -36,4 +37,4 @@ public: -SCREEN_UPDATE_IND16( iqblock ); + diff --git a/src/mame/includes/irobot.h b/src/mame/includes/irobot.h index 9cd46e6260f..7a349cfe9d9 100644 --- a/src/mame/includes/irobot.h +++ b/src/mame/includes/irobot.h @@ -77,6 +77,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_irobot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in machine/irobot.c -----------*/ @@ -92,7 +93,7 @@ TIMER_DEVICE_CALLBACK( irobot_irmb_done_callback ); -SCREEN_UPDATE_IND16( irobot ); + void irobot_poly_clear(running_machine &machine); diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h index 75f9bd652b3..5046f85d325 100644 --- a/src/mame/includes/ironhors.h +++ b/src/mame/includes/ironhors.h @@ -48,6 +48,8 @@ public: virtual void video_start(); virtual void palette_init(); DECLARE_VIDEO_START(farwest); + UINT32 screen_update_ironhors(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_farwest(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -56,6 +58,6 @@ public: -SCREEN_UPDATE_IND16( ironhors ); -SCREEN_UPDATE_IND16( farwest ); + + diff --git a/src/mame/includes/itech32.h b/src/mame/includes/itech32.h index 921aa219df6..f0f84ee595d 100644 --- a/src/mame/includes/itech32.h +++ b/src/mame/includes/itech32.h @@ -157,6 +157,7 @@ public: virtual void machine_reset(); virtual void video_start(); DECLARE_MACHINE_RESET(drivedge); + UINT32 screen_update_itech32(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -176,4 +177,4 @@ void itech32_update_interrupts(running_machine &machine, int vint, int xint, int -SCREEN_UPDATE_IND16( itech32 ); + diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h index 02916d6b48e..bb0bb7dcdc0 100644 --- a/src/mame/includes/itech8.h +++ b/src/mame/includes/itech8.h @@ -89,6 +89,11 @@ public: virtual void video_start(); DECLARE_VIDEO_START(slikshot); DECLARE_MACHINE_START(sstrike); + UINT32 screen_update_itech8_2layer(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_itech8_grmatch(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_slikshot(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_itech8_2page(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_itech8_2page_large(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -107,7 +112,7 @@ DECLARE_READ8_HANDLER( slikshot_z80_control_r ); DECLARE_WRITE8_HANDLER( slikshot_z80_control_w ); -SCREEN_UPDATE_RGB32( slikshot ); + /*----------- defined in video/itech8.c -----------*/ @@ -120,7 +125,7 @@ SCREEN_UPDATE_RGB32( slikshot ); TIMER_DEVICE_CALLBACK( grmatch_palette_update ); -SCREEN_UPDATE_RGB32( itech8_2layer ); -SCREEN_UPDATE_RGB32( itech8_grmatch ); -SCREEN_UPDATE_RGB32( itech8_2page ); -SCREEN_UPDATE_RGB32( itech8_2page_large ); + + + + diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h index cf8b956c04b..76c5a35c546 100644 --- a/src/mame/includes/jack.h +++ b/src/mame/includes/jack.h @@ -55,6 +55,8 @@ public: virtual void video_start(); DECLARE_VIDEO_START(joinem); DECLARE_PALETTE_INIT(joinem); + UINT32 screen_update_jack(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_joinem(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -62,8 +64,8 @@ public: -SCREEN_UPDATE_IND16( jack ); -SCREEN_UPDATE_IND16( joinem ); + + diff --git a/src/mame/includes/jackal.h b/src/mame/includes/jackal.h index 6ed63b00196..decdd1b5d7d 100644 --- a/src/mame/includes/jackal.h +++ b/src/mame/includes/jackal.h @@ -42,6 +42,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_jackal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -51,4 +52,4 @@ void jackal_mark_tile_dirty(running_machine &machine, int offset); -SCREEN_UPDATE_IND16( jackal ); + diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h index 0c13bfa3ca1..6f617fa2752 100644 --- a/src/mame/includes/jailbrek.h +++ b/src/mame/includes/jailbrek.h @@ -42,6 +42,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_jailbrek(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -50,4 +51,4 @@ public: -SCREEN_UPDATE_IND16( jailbrek ); + diff --git a/src/mame/includes/jedi.h b/src/mame/includes/jedi.h index b5d4fc7ca49..7edca52130c 100644 --- a/src/mame/includes/jedi.h +++ b/src/mame/includes/jedi.h @@ -76,6 +76,7 @@ public: virtual void machine_start(); virtual void machine_reset(); DECLARE_VIDEO_START(jedi); + UINT32 screen_update_jedi(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/kaneko16.h b/src/mame/includes/kaneko16.h index e4a2a694f3b..f1672c6995b 100644 --- a/src/mame/includes/kaneko16.h +++ b/src/mame/includes/kaneko16.h @@ -63,6 +63,8 @@ public: DECLARE_MACHINE_RESET(gtmr); DECLARE_VIDEO_START(kaneko16); DECLARE_MACHINE_RESET(mgcrystl); + UINT32 screen_update_kaneko16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_common(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; class kaneko16_gtmr_state : public kaneko16_state @@ -112,6 +114,7 @@ public: DECLARE_DRIVER_INIT(berlwall); DECLARE_PALETTE_INIT(berlwall); DECLARE_VIDEO_START(berlwall); + UINT32 screen_update_berlwall(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; class kaneko16_shogwarr_state : public kaneko16_state @@ -143,8 +146,8 @@ public: -SCREEN_UPDATE_IND16( kaneko16 ); -SCREEN_UPDATE_IND16( berlwall ); + + #endif diff --git a/src/mame/includes/kangaroo.h b/src/mame/includes/kangaroo.h index 2c1316eed4f..e96d5a4e2df 100644 --- a/src/mame/includes/kangaroo.h +++ b/src/mame/includes/kangaroo.h @@ -30,6 +30,7 @@ public: virtual void machine_reset(); virtual void video_start(); DECLARE_MACHINE_START(kangaroo_mcu); + UINT32 screen_update_kangaroo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -38,5 +39,5 @@ public: /*----------- defined in video/kangaroo.c -----------*/ -SCREEN_UPDATE_RGB32( kangaroo ); + diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h index 7508c24f824..86b7caa5728 100644 --- a/src/mame/includes/karnov.h +++ b/src/mame/includes/karnov.h @@ -57,6 +57,7 @@ public: virtual void palette_init(); DECLARE_VIDEO_START(karnov); DECLARE_VIDEO_START(wndrplnt); + UINT32 screen_update_karnov(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; enum { @@ -77,4 +78,4 @@ void karnov_flipscreen_w(running_machine &machine, int data); -SCREEN_UPDATE_IND16( karnov ); + diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h index d74e95a085a..a20187d102a 100644 --- a/src/mame/includes/kchamp.h +++ b/src/mame/includes/kchamp.h @@ -48,6 +48,8 @@ public: virtual void palette_init(); DECLARE_MACHINE_START(kchampvs); DECLARE_MACHINE_START(kchamp); + UINT32 screen_update_kchampvs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_kchamp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -56,5 +58,5 @@ public: -SCREEN_UPDATE_IND16( kchamp ); -SCREEN_UPDATE_IND16( kchampvs ); + + diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h index 2fa7101d350..d122ba691ec 100644 --- a/src/mame/includes/kickgoal.h +++ b/src/mame/includes/kickgoal.h @@ -74,6 +74,7 @@ public: virtual void machine_reset(); DECLARE_VIDEO_START(kickgoal); DECLARE_VIDEO_START(actionhw); + UINT32 screen_update_kickgoal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -81,5 +82,5 @@ public: -SCREEN_UPDATE_IND16( kickgoal ); + diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h index 22497c4a47e..3e817feb4d8 100644 --- a/src/mame/includes/kingobox.h +++ b/src/mame/includes/kingobox.h @@ -56,6 +56,8 @@ public: DECLARE_PALETTE_INIT(kingofb); DECLARE_VIDEO_START(ringking); DECLARE_PALETTE_INIT(ringking); + UINT32 screen_update_kingofb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_ringking(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -64,8 +66,8 @@ public: -SCREEN_UPDATE_IND16( kingofb ); -SCREEN_UPDATE_IND16( ringking ); + + diff --git a/src/mame/includes/klax.h b/src/mame/includes/klax.h index f10215138ce..3ee88b0a321 100644 --- a/src/mame/includes/klax.h +++ b/src/mame/includes/klax.h @@ -16,6 +16,7 @@ public: DECLARE_MACHINE_START(klax); DECLARE_MACHINE_RESET(klax); DECLARE_VIDEO_START(klax); + UINT32 screen_update_klax(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -24,4 +25,4 @@ public: DECLARE_WRITE16_HANDLER( klax_latch_w ); -SCREEN_UPDATE_IND16( klax ); + diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h index d477826ef72..fa4205a8b2d 100644 --- a/src/mame/includes/kncljoe.h +++ b/src/mame/includes/kncljoe.h @@ -45,6 +45,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_kncljoe(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -54,4 +55,4 @@ public: -SCREEN_UPDATE_IND16( kncljoe ); + diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h index f8f70462fad..aeeb2a5fcc3 100644 --- a/src/mame/includes/konamigx.h +++ b/src/mame/includes/konamigx.h @@ -75,6 +75,9 @@ public: DECLARE_VIDEO_START(konamigx_type4_vsn); DECLARE_VIDEO_START(konamigx_type4_sd2); DECLARE_VIDEO_START(winspike); + UINT32 screen_update_konamigx(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_konamigx_left(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_konamigx_right(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -160,9 +163,9 @@ extern UINT16 *K053247_ram; -SCREEN_UPDATE_RGB32(konamigx); -SCREEN_UPDATE_RGB32(konamigx_left); -SCREEN_UPDATE_RGB32(konamigx_right); + + + extern int konamigx_current_frame; diff --git a/src/mame/includes/kopunch.h b/src/mame/includes/kopunch.h index eea6782bcac..9995a2dd7ac 100644 --- a/src/mame/includes/kopunch.h +++ b/src/mame/includes/kopunch.h @@ -42,6 +42,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_kopunch(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/kopunch.c -----------*/ @@ -49,4 +50,4 @@ public: -SCREEN_UPDATE_IND16( kopunch ); + diff --git a/src/mame/includes/ksayakyu.h b/src/mame/includes/ksayakyu.h index 45b48c4c671..7f8ce399e2d 100644 --- a/src/mame/includes/ksayakyu.h +++ b/src/mame/includes/ksayakyu.h @@ -39,6 +39,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_ksayakyu(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -46,4 +47,4 @@ public: -SCREEN_UPDATE_IND16( ksayakyu ); + diff --git a/src/mame/includes/kyugo.h b/src/mame/includes/kyugo.h index 53be22eeae5..eeb459ef334 100644 --- a/src/mame/includes/kyugo.h +++ b/src/mame/includes/kyugo.h @@ -58,6 +58,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_kyugo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -66,4 +67,4 @@ public: -SCREEN_UPDATE_IND16( kyugo ); + diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h index a83a6084ef2..d124a387f17 100644 --- a/src/mame/includes/labyrunr.h +++ b/src/mame/includes/labyrunr.h @@ -41,6 +41,7 @@ public: virtual void machine_start(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_labyrunr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -50,4 +51,4 @@ public: -SCREEN_UPDATE_IND16( labyrunr ); + diff --git a/src/mame/includes/ladybug.h b/src/mame/includes/ladybug.h index d85157f00f4..0d1027d7e4a 100644 --- a/src/mame/includes/ladybug.h +++ b/src/mame/includes/ladybug.h @@ -76,6 +76,11 @@ public: DECLARE_MACHINE_RESET(redclash); DECLARE_VIDEO_START(redclash); DECLARE_PALETTE_INIT(redclash); + UINT32 screen_update_ladybug(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_sraider(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_redclash(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_sraider(screen_device &screen, bool state); + void screen_eof_redclash(screen_device &screen, bool state); }; @@ -84,12 +89,12 @@ public: -SCREEN_UPDATE_IND16( ladybug ); -SCREEN_UPDATE_IND16( sraider ); -SCREEN_VBLANK( sraider ); + + + /*----------- defined in video/redclash.c -----------*/ @@ -104,8 +109,8 @@ DECLARE_WRITE8_HANDLER( redclash_star_reset_w ); -SCREEN_UPDATE_IND16( redclash ); -SCREEN_VBLANK( redclash ); + + /* sraider uses the zerohour star generator board */ void redclash_set_stars_enable(running_machine &machine, UINT8 on); diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h index e1bfdc30c70..ffe6ed9dc29 100644 --- a/src/mame/includes/ladyfrog.h +++ b/src/mame/includes/ladyfrog.h @@ -58,6 +58,7 @@ public: virtual void video_start(); DECLARE_VIDEO_START(toucheme); DECLARE_VIDEO_START(ladyfrog_common); + UINT32 screen_update_ladyfrog(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -67,4 +68,4 @@ public: -SCREEN_UPDATE_IND16( ladyfrog ); + diff --git a/src/mame/includes/laserbat.h b/src/mame/includes/laserbat.h index ef186bdce48..7a9cd7602a6 100644 --- a/src/mame/includes/laserbat.h +++ b/src/mame/includes/laserbat.h @@ -81,6 +81,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_laserbat(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h index ba82d3cab88..188351b0510 100644 --- a/src/mame/includes/lasso.h +++ b/src/mame/includes/lasso.h @@ -66,6 +66,9 @@ public: DECLARE_VIDEO_START(wwjgtin); DECLARE_PALETTE_INIT(wwjgtin); DECLARE_VIDEO_START(pinbo); + UINT32 screen_update_lasso(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_chameleo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_wwjgtin(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -79,6 +82,6 @@ public: -SCREEN_UPDATE_IND16( lasso ); -SCREEN_UPDATE_IND16( chameleo ); -SCREEN_UPDATE_IND16( wwjgtin ); + + + diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h index fbab77a587e..2e898bccaff 100644 --- a/src/mame/includes/lastduel.h +++ b/src/mame/includes/lastduel.h @@ -58,6 +58,8 @@ public: DECLARE_VIDEO_START(lastduel); DECLARE_MACHINE_START(madgear); DECLARE_VIDEO_START(madgear); + UINT32 screen_update_lastduel(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_madgear(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/lastduel.c -----------*/ @@ -65,5 +67,5 @@ public: -SCREEN_UPDATE_IND16( lastduel ); -SCREEN_UPDATE_IND16( madgear ); + + diff --git a/src/mame/includes/lazercmd.h b/src/mame/includes/lazercmd.h index e46cf6d923e..f741a370a63 100644 --- a/src/mame/includes/lazercmd.h +++ b/src/mame/includes/lazercmd.h @@ -56,9 +56,10 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void palette_init(); + UINT32 screen_update_lazercmd(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/lazercmd.c -----------*/ -SCREEN_UPDATE_IND16( lazercmd ); + diff --git a/src/mame/includes/legionna.h b/src/mame/includes/legionna.h index 61e3cbb4ac9..1a8d2220875 100644 --- a/src/mame/includes/legionna.h +++ b/src/mame/includes/legionna.h @@ -49,6 +49,9 @@ public: DECLARE_VIDEO_START(denjinmk); DECLARE_VIDEO_START(grainbow); DECLARE_VIDEO_START(cupsoc); + UINT32 screen_update_legionna(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_godzilla(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_grainbow(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -57,6 +60,6 @@ public: void heatbrl_setgfxbank(running_machine &machine, UINT16 data); void denjinmk_setgfxbank(running_machine &machine, UINT16 data); -SCREEN_UPDATE_IND16( legionna ); -SCREEN_UPDATE_IND16( godzilla ); -SCREEN_UPDATE_IND16( grainbow ); + + + diff --git a/src/mame/includes/leland.h b/src/mame/includes/leland.h index e1b0af22a29..ddd222128c8 100644 --- a/src/mame/includes/leland.h +++ b/src/mame/includes/leland.h @@ -140,6 +140,8 @@ public: DECLARE_MACHINE_RESET(leland); DECLARE_VIDEO_START(leland); DECLARE_VIDEO_START(ataxx); + UINT32 screen_update_leland(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_ataxx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/lemmings.h b/src/mame/includes/lemmings.h index ed0c779437d..c69f4f00fa2 100644 --- a/src/mame/includes/lemmings.h +++ b/src/mame/includes/lemmings.h @@ -43,6 +43,8 @@ public: TILE_GET_INFO_MEMBER(get_tile_info); virtual void machine_start(); virtual void video_start(); + UINT32 screen_update_lemmings(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void screen_eof_lemmings(screen_device &screen, bool state); }; @@ -50,6 +52,6 @@ public: -SCREEN_VBLANK( lemmings ); -SCREEN_UPDATE_RGB32( lemmings ); + + diff --git a/src/mame/includes/lethal.h b/src/mame/includes/lethal.h index cb45a1b31cc..5f9e9fd2bed 100644 --- a/src/mame/includes/lethal.h +++ b/src/mame/includes/lethal.h @@ -39,6 +39,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_lethalen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/lethal.c -----------*/ @@ -48,4 +49,4 @@ extern void lethalen_tile_callback(running_machine &machine, int layer, int *cod -SCREEN_UPDATE_IND16(lethalen); + diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h index f626820cb33..9a41037b8d3 100644 --- a/src/mame/includes/liberate.h +++ b/src/mame/includes/liberate.h @@ -63,16 +63,20 @@ public: DECLARE_VIDEO_START(prosport); DECLARE_VIDEO_START(boomrang); DECLARE_VIDEO_START(prosoccr); + UINT32 screen_update_liberate(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_prosport(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_boomrang(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_prosoccr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/liberate.c -----------*/ -SCREEN_UPDATE_IND16( prosoccr ); -SCREEN_UPDATE_IND16( prosport ); -SCREEN_UPDATE_IND16( liberate ); -SCREEN_UPDATE_IND16( boomrang ); + + + + diff --git a/src/mame/includes/lkage.h b/src/mame/includes/lkage.h index 755521ee5f1..ce70de59002 100644 --- a/src/mame/includes/lkage.h +++ b/src/mame/includes/lkage.h @@ -82,6 +82,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_lkage(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in machine/lkage.c -----------*/ @@ -91,5 +92,5 @@ public: /*----------- defined in video/lkage.c -----------*/ -SCREEN_UPDATE_IND16( lkage ); + diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h index b353e4cb969..410d44ca639 100644 --- a/src/mame/includes/lockon.h +++ b/src/mame/includes/lockon.h @@ -103,6 +103,8 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_lockon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_lockon(screen_device &screen, bool state); }; @@ -110,6 +112,6 @@ public: -SCREEN_UPDATE_IND16( lockon ); -SCREEN_VBLANK( lockon ); + + diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h index 4e0e913f911..ba50abdb4af 100644 --- a/src/mame/includes/lordgun.h +++ b/src/mame/includes/lordgun.h @@ -63,6 +63,7 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_2); TILE_GET_INFO_MEMBER(get_tile_info_3); virtual void video_start(); + UINT32 screen_update_lordgun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -73,4 +74,4 @@ float lordgun_crosshair_mapper(const ioport_field *field, float linear_value); void lordgun_update_gun(running_machine &machine, int i); -SCREEN_UPDATE_IND16( lordgun ); + diff --git a/src/mame/includes/lsasquad.h b/src/mame/includes/lsasquad.h index 711418c0c58..67a2ecca3a7 100644 --- a/src/mame/includes/lsasquad.h +++ b/src/mame/includes/lsasquad.h @@ -59,6 +59,8 @@ public: DECLARE_WRITE8_MEMBER(unk); DECLARE_MACHINE_START(lsasquad); DECLARE_MACHINE_RESET(lsasquad); + UINT32 screen_update_lsasquad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_daikaiju(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in machine/lsasquad.c -----------*/ @@ -69,5 +71,5 @@ public: /*----------- defined in video/lsasquad.c -----------*/ -SCREEN_UPDATE_IND16( lsasquad ); -SCREEN_UPDATE_IND16( daikaiju ); + + diff --git a/src/mame/includes/lucky74.h b/src/mame/includes/lucky74.h index 25ff273b753..aaaa35643aa 100644 --- a/src/mame/includes/lucky74.h +++ b/src/mame/includes/lucky74.h @@ -39,6 +39,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_lucky74(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -46,4 +47,4 @@ public: -SCREEN_UPDATE_IND16( lucky74 ); + diff --git a/src/mame/includes/lvcards.h b/src/mame/includes/lvcards.h index 7476ef8d5af..a10109fa578 100644 --- a/src/mame/includes/lvcards.h +++ b/src/mame/includes/lvcards.h @@ -23,6 +23,7 @@ public: DECLARE_MACHINE_START(lvpoker); DECLARE_MACHINE_RESET(lvpoker); DECLARE_PALETTE_INIT(ponttehk); + UINT32 screen_update_lvcards(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -32,4 +33,4 @@ public: -SCREEN_UPDATE_IND16( lvcards ); + diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h index 9862966ec8c..331e2def7cb 100644 --- a/src/mame/includes/lwings.h +++ b/src/mame/includes/lwings.h @@ -58,6 +58,8 @@ public: virtual void video_start(); DECLARE_VIDEO_START(trojan); DECLARE_VIDEO_START(avengers); + UINT32 screen_update_lwings(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_trojan(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -67,5 +69,5 @@ public: -SCREEN_UPDATE_IND16( lwings ); -SCREEN_UPDATE_IND16( trojan ); + + diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h index 1b0ba989117..46c720a8dcb 100644 --- a/src/mame/includes/m10.h +++ b/src/mame/includes/m10.h @@ -86,6 +86,8 @@ public: DECLARE_VIDEO_START(m10); DECLARE_PALETTE_INIT(m10); DECLARE_VIDEO_START(m15); + UINT32 screen_update_m10(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_m15(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -93,8 +95,8 @@ public: -SCREEN_UPDATE_IND16( m10 ); -SCREEN_UPDATE_IND16( m15 ); + + diff --git a/src/mame/includes/m107.h b/src/mame/includes/m107.h index 45cc7046940..86c9287989f 100644 --- a/src/mame/includes/m107.h +++ b/src/mame/includes/m107.h @@ -49,10 +49,11 @@ public: TILE_GET_INFO_MEMBER(get_pf_tile_info); virtual void machine_start(); virtual void video_start(); + UINT32 screen_update_m107(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/m107.c -----------*/ -SCREEN_UPDATE_IND16( m107 ); + diff --git a/src/mame/includes/m52.h b/src/mame/includes/m52.h index c39aff93fcc..bf5994eaab2 100644 --- a/src/mame/includes/m52.h +++ b/src/mame/includes/m52.h @@ -34,6 +34,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_m52(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/m52.c -----------*/ @@ -41,4 +42,4 @@ public: -SCREEN_UPDATE_IND16( m52 ); + diff --git a/src/mame/includes/m57.h b/src/mame/includes/m57.h index 2471f0ec430..8daf40f6d20 100644 --- a/src/mame/includes/m57.h +++ b/src/mame/includes/m57.h @@ -20,6 +20,7 @@ public: TILE_GET_INFO_MEMBER(get_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_m57(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/m57.c -----------*/ @@ -27,4 +28,4 @@ public: -SCREEN_UPDATE_IND16( m57 ); + diff --git a/src/mame/includes/m58.h b/src/mame/includes/m58.h index 11f0041f3fa..66cdf09d822 100644 --- a/src/mame/includes/m58.h +++ b/src/mame/includes/m58.h @@ -30,6 +30,7 @@ public: TILEMAP_MAPPER_MEMBER(yard_tilemap_scan_rows); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_yard(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/m58.c -----------*/ @@ -37,4 +38,4 @@ public: -SCREEN_UPDATE_IND16( yard ); + diff --git a/src/mame/includes/m62.h b/src/mame/includes/m62.h index fb7f1a57006..5b7fc92b283 100644 --- a/src/mame/includes/m62.h +++ b/src/mame/includes/m62.h @@ -95,6 +95,17 @@ public: DECLARE_PALETTE_INIT(spelunk2); DECLARE_VIDEO_START(youjyudn); DECLARE_VIDEO_START(horizon); + UINT32 screen_update_ldrun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_kungfum(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_battroad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_ldrun3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_ldrun4(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_lotlot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_kidniki(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_spelunkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_spelunk2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_youjyudn(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_horizon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -119,14 +130,14 @@ public: -SCREEN_UPDATE_IND16( battroad ); -SCREEN_UPDATE_IND16( horizon ); -SCREEN_UPDATE_IND16( kidniki ); -SCREEN_UPDATE_IND16( kungfum ); -SCREEN_UPDATE_IND16( ldrun ); -SCREEN_UPDATE_IND16( ldrun3 ); -SCREEN_UPDATE_IND16( ldrun4 ); -SCREEN_UPDATE_IND16( lotlot ); -SCREEN_UPDATE_IND16( spelunkr ); -SCREEN_UPDATE_IND16( spelunk2 ); -SCREEN_UPDATE_IND16( youjyudn ); + + + + + + + + + + + diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h index 81c618b63b2..e7b56b294e6 100644 --- a/src/mame/includes/m72.h +++ b/src/mame/includes/m72.h @@ -115,6 +115,8 @@ public: DECLARE_VIDEO_START(poundfor); DECLARE_MACHINE_START(kengo); DECLARE_MACHINE_RESET(kengo); + UINT32 screen_update_m72(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_majtitle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -129,5 +131,5 @@ public: -SCREEN_UPDATE_IND16( m72 ); -SCREEN_UPDATE_IND16( majtitle ); + + diff --git a/src/mame/includes/m90.h b/src/mame/includes/m90.h index 36e178f6e6f..fd6861a4526 100644 --- a/src/mame/includes/m90.h +++ b/src/mame/includes/m90.h @@ -40,6 +40,9 @@ public: virtual void video_start(); DECLARE_VIDEO_START(bomblord); DECLARE_VIDEO_START(dynablsb); + UINT32 screen_update_m90(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_bomblord(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_dynablsb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -48,6 +51,6 @@ public: -SCREEN_UPDATE_IND16( m90 ); -SCREEN_UPDATE_IND16( dynablsb ); -SCREEN_UPDATE_IND16( bomblord ); + + + diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h index f8a58ee4ca2..dc171e30a66 100644 --- a/src/mame/includes/m92.h +++ b/src/mame/includes/m92.h @@ -75,6 +75,8 @@ public: DECLARE_MACHINE_RESET(m92); DECLARE_VIDEO_START(m92); DECLARE_VIDEO_START(ppan); + UINT32 screen_update_m92(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_ppan(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -87,6 +89,6 @@ extern void m92_sprite_interrupt(running_machine &machine); -SCREEN_UPDATE_IND16( m92 ); -SCREEN_UPDATE_IND16( ppan ); + + diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h index 6cabf8ef32f..ebbb1a94ae9 100644 --- a/src/mame/includes/macrossp.h +++ b/src/mame/includes/macrossp.h @@ -71,11 +71,13 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_macrossp(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void screen_eof_macrossp(screen_device &screen, bool state); }; /*----------- defined in video/macrossp.c -----------*/ -SCREEN_UPDATE_RGB32(macrossp); -SCREEN_VBLANK(macrossp); + + diff --git a/src/mame/includes/madalien.h b/src/mame/includes/madalien.h index b9642cdd760..fe2cad0b2ea 100644 --- a/src/mame/includes/madalien.h +++ b/src/mame/includes/madalien.h @@ -62,6 +62,7 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_FG); DECLARE_VIDEO_START(madalien); DECLARE_PALETTE_INIT(madalien); + UINT32 screen_update_madalien(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/madmotor.h b/src/mame/includes/madmotor.h index e24e8f5e51b..b3aa963b02f 100644 --- a/src/mame/includes/madmotor.h +++ b/src/mame/includes/madmotor.h @@ -26,10 +26,11 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_madmotor(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/madmotor.c -----------*/ -SCREEN_UPDATE_IND16( madmotor ); + diff --git a/src/mame/includes/magmax.h b/src/mame/includes/magmax.h index 95e9a1623ee..89123db6569 100644 --- a/src/mame/includes/magmax.h +++ b/src/mame/includes/magmax.h @@ -33,11 +33,12 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_magmax(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/magmax.c -----------*/ -SCREEN_UPDATE_IND16( magmax ); + diff --git a/src/mame/includes/mainevt.h b/src/mame/includes/mainevt.h index 784fca40f10..34a9600344b 100644 --- a/src/mame/includes/mainevt.h +++ b/src/mame/includes/mainevt.h @@ -43,6 +43,8 @@ public: virtual void machine_reset(); DECLARE_VIDEO_START(mainevt); DECLARE_VIDEO_START(dv); + UINT32 screen_update_mainevt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_dv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/mainevt.c -----------*/ @@ -55,5 +57,5 @@ extern void dv_sprite_callback(running_machine &machine, int *code,int *color,in -SCREEN_UPDATE_IND16( mainevt ); -SCREEN_UPDATE_IND16( dv ); + + diff --git a/src/mame/includes/mainsnk.h b/src/mame/includes/mainsnk.h index 5bda13459e2..b2ae4b147a4 100644 --- a/src/mame/includes/mainsnk.h +++ b/src/mame/includes/mainsnk.h @@ -27,6 +27,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_mainsnk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -34,4 +35,4 @@ public: -SCREEN_UPDATE_IND16(mainsnk); + diff --git a/src/mame/includes/malzak.h b/src/mame/includes/malzak.h index 685323c756c..d16e4166763 100644 --- a/src/mame/includes/malzak.h +++ b/src/mame/includes/malzak.h @@ -42,10 +42,11 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void palette_init(); + UINT32 screen_update_malzak(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/malzak.c -----------*/ -SCREEN_UPDATE_RGB32( malzak ); + diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h index 18a8c6d8eb5..653aaa2eca7 100644 --- a/src/mame/includes/mappy.h +++ b/src/mame/includes/mappy.h @@ -49,6 +49,9 @@ public: DECLARE_MACHINE_RESET(mappy); DECLARE_VIDEO_START(mappy); DECLARE_PALETTE_INIT(mappy); + UINT32 screen_update_superpac(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_phozon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_mappy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -56,11 +59,11 @@ public: -SCREEN_UPDATE_IND16( phozon ); -SCREEN_UPDATE_IND16( superpac ); -SCREEN_UPDATE_IND16( mappy ); + + + diff --git a/src/mame/includes/marineb.h b/src/mame/includes/marineb.h index 82f49c003ec..a4900448380 100644 --- a/src/mame/includes/marineb.h +++ b/src/mame/includes/marineb.h @@ -39,6 +39,11 @@ public: virtual void video_start(); virtual void palette_init(); DECLARE_MACHINE_RESET(springer); + UINT32 screen_update_marineb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_changes(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_springer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_hoccer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_hopprobo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -47,8 +52,8 @@ public: -SCREEN_UPDATE_IND16( marineb ); -SCREEN_UPDATE_IND16( changes ); -SCREEN_UPDATE_IND16( springer ); -SCREEN_UPDATE_IND16( hoccer ); -SCREEN_UPDATE_IND16( hopprobo ); + + + + + diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h index a4715f8bf81..424eeb7c5cf 100644 --- a/src/mame/includes/mario.h +++ b/src/mame/includes/mario.h @@ -81,6 +81,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_mario(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/mario.c -----------*/ @@ -88,7 +89,7 @@ public: -SCREEN_UPDATE_IND16( mario ); + /*----------- defined in audio/mario.c -----------*/ diff --git a/src/mame/includes/markham.h b/src/mame/includes/markham.h index 06121c50f20..5147d12e72c 100644 --- a/src/mame/includes/markham.h +++ b/src/mame/includes/markham.h @@ -26,6 +26,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_markham(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -34,4 +35,4 @@ public: -SCREEN_UPDATE_IND16( markham ); + diff --git a/src/mame/includes/matmania.h b/src/mame/includes/matmania.h index d5ed9e48255..f8912d258c4 100644 --- a/src/mame/includes/matmania.h +++ b/src/mame/includes/matmania.h @@ -59,6 +59,8 @@ public: DECLARE_MACHINE_START(matmania); DECLARE_MACHINE_START(maniach); DECLARE_MACHINE_RESET(maniach); + UINT32 screen_update_matmania(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_maniach(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in machine/maniach.c -----------*/ @@ -80,6 +82,6 @@ DECLARE_READ8_HANDLER( maniach_mcu_status_r ); /*----------- defined in video/matmania.c -----------*/ -SCREEN_UPDATE_IND16( maniach ); -SCREEN_UPDATE_IND16( matmania ); + + diff --git a/src/mame/includes/mcatadv.h b/src/mame/includes/mcatadv.h index 0aee1ae9e8e..7c6bc50d7aa 100644 --- a/src/mame/includes/mcatadv.h +++ b/src/mame/includes/mcatadv.h @@ -41,11 +41,13 @@ public: TILE_GET_INFO_MEMBER(get_mcatadv_tile_info2); virtual void machine_start(); virtual void video_start(); + UINT32 screen_update_mcatadv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_mcatadv(screen_device &screen, bool state); }; /*----------- defined in video/mcatadv.c -----------*/ -SCREEN_UPDATE_IND16( mcatadv ); -SCREEN_VBLANK( mcatadv ); + + diff --git a/src/mame/includes/mcr.h b/src/mame/includes/mcr.h index 008c19926b6..e1bdc041a9b 100644 --- a/src/mame/includes/mcr.h +++ b/src/mame/includes/mcr.h @@ -100,6 +100,7 @@ public: DECLARE_MACHINE_RESET(mcr); DECLARE_VIDEO_START(mcr); DECLARE_MACHINE_START(nflfoot); + UINT32 screen_update_mcr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -143,4 +144,4 @@ extern INT8 mcr12_sprite_xoffs_flip; -SCREEN_UPDATE_IND16( mcr ); + diff --git a/src/mame/includes/mcr3.h b/src/mame/includes/mcr3.h index 4cf71a137c8..03bf8569136 100644 --- a/src/mame/includes/mcr3.h +++ b/src/mame/includes/mcr3.h @@ -63,6 +63,8 @@ public: DECLARE_VIDEO_START(mcrmono); DECLARE_VIDEO_START(spyhunt); DECLARE_PALETTE_INIT(spyhunt); + UINT32 screen_update_mcr3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_spyhunt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -74,5 +76,5 @@ public: -SCREEN_UPDATE_IND16( mcr3 ); -SCREEN_UPDATE_IND16( spyhunt ); + + diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h index f785b4e1c02..4d3de36a942 100644 --- a/src/mame/includes/mcr68.h +++ b/src/mame/includes/mcr68.h @@ -96,6 +96,8 @@ public: DECLARE_MACHINE_START(mcr68); DECLARE_MACHINE_RESET(mcr68); DECLARE_VIDEO_START(mcr68); + UINT32 screen_update_zwackery(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_mcr68(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in machine/mcr68.c -----------*/ @@ -118,8 +120,8 @@ INTERRUPT_GEN( mcr68_interrupt ); -SCREEN_UPDATE_IND16( mcr68 ); -SCREEN_UPDATE_IND16( zwackery ); + + diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h index 4c5227f6ec3..39b7aebd4f3 100644 --- a/src/mame/includes/meadows.h +++ b/src/mame/includes/meadows.h @@ -45,6 +45,7 @@ public: TILE_GET_INFO_MEMBER(get_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_meadows(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -58,5 +59,5 @@ void meadows_sh_update(running_machine &machine); /*----------- defined in video/meadows.c -----------*/ -SCREEN_UPDATE_IND16( meadows ); + diff --git a/src/mame/includes/megadriv.h b/src/mame/includes/megadriv.h index c7f1d51f658..a1339a5d7d7 100644 --- a/src/mame/includes/megadriv.h +++ b/src/mame/includes/megadriv.h @@ -274,7 +274,8 @@ public: DECLARE_VIDEO_START(segac2_new); DECLARE_MACHINE_START(segac2); DECLARE_MACHINE_RESET(segac2); - + + UINT32 screen_update_segac2_new(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; class mplay_state : public md_base_state @@ -313,6 +314,9 @@ public: DECLARE_DRIVER_INIT(megaplay); DECLARE_VIDEO_START(megplay); DECLARE_MACHINE_RESET(megaplay); + + UINT32 screen_update_megplay(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void screen_eof_megaplay(screen_device &screen, bool state); }; class mtech_state : public md_base_state @@ -348,6 +352,9 @@ public: DECLARE_DRIVER_INIT(mt_slot); DECLARE_VIDEO_START(mtnew); DECLARE_MACHINE_RESET(mtnew); + UINT32 screen_update_mtnew(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void screen_eof_mtnew(screen_device &screen, bool state); + UINT32 screen_update_megatech_menu(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; struct megadriv_cart diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h index d8106359d3c..dd3d115ab66 100644 --- a/src/mame/includes/megasys1.h +++ b/src/mame/includes/megasys1.h @@ -110,14 +110,16 @@ public: DECLARE_VIDEO_START(megasys1); DECLARE_PALETTE_INIT(megasys1); DECLARE_MACHINE_RESET(megasys1_hachoo); + UINT32 screen_update_megasys1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_megasys1(screen_device &screen, bool state); }; /*----------- defined in video/megasys1.c -----------*/ -SCREEN_UPDATE_IND16( megasys1 ); -SCREEN_VBLANK( megasys1 ); + + diff --git a/src/mame/includes/megazone.h b/src/mame/includes/megazone.h index 78fb6dfdaf4..cf741772005 100644 --- a/src/mame/includes/megazone.h +++ b/src/mame/includes/megazone.h @@ -51,6 +51,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_megazone(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -60,4 +61,4 @@ public: -SCREEN_UPDATE_IND16( megazone ); + diff --git a/src/mame/includes/mermaid.h b/src/mame/includes/mermaid.h index 2b2a0729639..ae137e6640a 100644 --- a/src/mame/includes/mermaid.h +++ b/src/mame/includes/mermaid.h @@ -77,6 +77,8 @@ public: virtual void video_start(); virtual void palette_init(); DECLARE_PALETTE_INIT(rougien); + UINT32 screen_update_mermaid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_mermaid(screen_device &screen, bool state); }; @@ -87,5 +89,5 @@ public: -SCREEN_UPDATE_IND16( mermaid ); -SCREEN_VBLANK( mermaid ); + + diff --git a/src/mame/includes/metalmx.h b/src/mame/includes/metalmx.h index 382c20ead1f..78e8bb60193 100644 --- a/src/mame/includes/metalmx.h +++ b/src/mame/includes/metalmx.h @@ -48,4 +48,5 @@ public: DECLARE_DRIVER_INIT(metalmx); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_metalmx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/metlclsh.h b/src/mame/includes/metlclsh.h index 9494549d9ae..eefdc214e8e 100644 --- a/src/mame/includes/metlclsh.h +++ b/src/mame/includes/metlclsh.h @@ -49,6 +49,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_metlclsh(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -56,4 +57,4 @@ public: -SCREEN_UPDATE_IND16( metlclsh ); + diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h index efb09d3ceb3..4e304340f56 100644 --- a/src/mame/includes/metro.h +++ b/src/mame/includes/metro.h @@ -161,6 +161,7 @@ public: DECLARE_VIDEO_START(metro_i4300); DECLARE_VIDEO_START(blzntrnd); DECLARE_VIDEO_START(gstrik2); + UINT32 screen_update_metro(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -173,6 +174,6 @@ public: -SCREEN_UPDATE_IND16( metro ); + void metro_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/mexico86.h b/src/mame/includes/mexico86.h index ec3cafac569..87c0dcd1357 100644 --- a/src/mame/includes/mexico86.h +++ b/src/mame/includes/mexico86.h @@ -53,6 +53,8 @@ public: DECLARE_READ8_MEMBER(kiki_ym2203_r); virtual void machine_start(); virtual void machine_reset(); + UINT32 screen_update_mexico86(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_kikikai(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -65,5 +67,5 @@ INTERRUPT_GEN( mexico86_m68705_interrupt ); /*----------- defined in video/mexico86.c -----------*/ -SCREEN_UPDATE_IND16( mexico86 ); -SCREEN_UPDATE_IND16( kikikai ); + + diff --git a/src/mame/includes/midvunit.h b/src/mame/includes/midvunit.h index 458c39e6105..f465f5a2d4b 100644 --- a/src/mame/includes/midvunit.h +++ b/src/mame/includes/midvunit.h @@ -119,6 +119,7 @@ public: virtual void machine_reset(); virtual void video_start(); DECLARE_MACHINE_RESET(midvplus); + UINT32 screen_update_midvunit(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -132,4 +133,4 @@ public: -SCREEN_UPDATE_IND16( midvunit ); + diff --git a/src/mame/includes/midzeus.h b/src/mame/includes/midzeus.h index ae80c733f0a..d39b94deacc 100644 --- a/src/mame/includes/midzeus.h +++ b/src/mame/includes/midzeus.h @@ -56,19 +56,21 @@ public: DECLARE_MACHINE_RESET(midzeus); DECLARE_VIDEO_START(midzeus); DECLARE_VIDEO_START(midzeus2); + UINT32 screen_update_midzeus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_midzeus2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/midzeus.c -----------*/ -SCREEN_UPDATE_IND16( midzeus ); + /*----------- defined in video/midzeus2.c -----------*/ -SCREEN_UPDATE_RGB32( midzeus2 ); + DECLARE_READ32_HANDLER( zeus2_r ); DECLARE_WRITE32_HANDLER( zeus2_w ); diff --git a/src/mame/includes/mikie.h b/src/mame/includes/mikie.h index e43e2aebbaf..d0824ebddd0 100644 --- a/src/mame/includes/mikie.h +++ b/src/mame/includes/mikie.h @@ -43,6 +43,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_mikie(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -51,4 +52,4 @@ public: -SCREEN_UPDATE_IND16( mikie ); + diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h index ef776411831..e08fd4aa641 100644 --- a/src/mame/includes/mitchell.h +++ b/src/mame/includes/mitchell.h @@ -100,6 +100,7 @@ public: DECLARE_MACHINE_START(mitchell); DECLARE_MACHINE_RESET(mitchell); DECLARE_VIDEO_START(pang); + UINT32 screen_update_pang(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -109,4 +110,4 @@ public: -SCREEN_UPDATE_IND16( pang ); + diff --git a/src/mame/includes/mjkjidai.h b/src/mame/includes/mjkjidai.h index 208fea9fb77..f6c88ef7a18 100644 --- a/src/mame/includes/mjkjidai.h +++ b/src/mame/includes/mjkjidai.h @@ -28,12 +28,13 @@ public: DECLARE_WRITE8_MEMBER(adpcm_w); TILE_GET_INFO_MEMBER(get_tile_info); virtual void video_start(); + UINT32 screen_update_mjkjidai(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/mjkjidai.c -----------*/ -SCREEN_UPDATE_IND16( mjkjidai ); + diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h index 7a109e0ffc8..6ad24802ce0 100644 --- a/src/mame/includes/model1.h +++ b/src/mame/includes/model1.h @@ -134,6 +134,8 @@ public: DECLARE_MACHINE_RESET(model1); DECLARE_VIDEO_START(model1); DECLARE_MACHINE_RESET(model1_vr); + UINT32 screen_update_model1(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void screen_eof_model1(screen_device &screen, bool state); }; @@ -154,6 +156,6 @@ void model1_tgp_reset(running_machine &machine, int swa); /*----------- defined in video/model1.c -----------*/ -SCREEN_UPDATE_RGB32(model1); -SCREEN_VBLANK(model1); + + diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h index d6dc3d45c57..a79d8e10890 100644 --- a/src/mame/includes/model2.h +++ b/src/mame/includes/model2.h @@ -162,12 +162,13 @@ public: DECLARE_MACHINE_RESET(model2c); DECLARE_MACHINE_RESET(model2_common); DECLARE_MACHINE_RESET(model2_scsp); + UINT32 screen_update_model2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/model2.c -----------*/ -SCREEN_UPDATE_RGB32(model2); + void model2_3d_set_zclip( running_machine &machine, UINT8 clip ); diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h index 93511c44449..0a868f884bc 100644 --- a/src/mame/includes/model3.h +++ b/src/mame/includes/model3.h @@ -197,6 +197,7 @@ public: DECLARE_MACHINE_RESET(model3_20); DECLARE_MACHINE_START(model3_21); DECLARE_MACHINE_RESET(model3_21); + UINT32 screen_update_model3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -217,7 +218,7 @@ void model3_tap_reset(running_machine &machine); -SCREEN_UPDATE_IND16(model3); + void real3d_display_list_end(running_machine &machine); void real3d_display_list1_dma(address_space &space, UINT32 src, UINT32 dst, int length, int byteswap); diff --git a/src/mame/includes/momoko.h b/src/mame/includes/momoko.h index 36a52861f40..bca3c728b46 100644 --- a/src/mame/includes/momoko.h +++ b/src/mame/includes/momoko.h @@ -45,10 +45,11 @@ public: DECLARE_WRITE8_MEMBER(momoko_flipscreen_w); virtual void machine_start(); virtual void machine_reset(); + UINT32 screen_update_momoko(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/momoko.c -----------*/ -SCREEN_UPDATE_IND16( momoko ); + diff --git a/src/mame/includes/moo.h b/src/mame/includes/moo.h index 87b6e7e5d73..8478cee815b 100644 --- a/src/mame/includes/moo.h +++ b/src/mame/includes/moo.h @@ -53,6 +53,7 @@ public: DECLARE_MACHINE_START(moo); DECLARE_MACHINE_RESET(moo); DECLARE_VIDEO_START(moo); + UINT32 screen_update_moo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -63,4 +64,4 @@ extern void moo_tile_callback(running_machine &machine, int layer, int *code, in extern void moo_sprite_callback(running_machine &machine, int *code, int *color, int *priority_mask); -SCREEN_UPDATE_RGB32(moo); + diff --git a/src/mame/includes/mosaic.h b/src/mame/includes/mosaic.h index b7127c64855..0544a6d49f9 100644 --- a/src/mame/includes/mosaic.h +++ b/src/mame/includes/mosaic.h @@ -34,6 +34,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_mosaic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -41,4 +42,4 @@ public: -SCREEN_UPDATE_IND16( mosaic ); + diff --git a/src/mame/includes/mouser.h b/src/mame/includes/mouser.h index 865941784a7..03876733b2e 100644 --- a/src/mame/includes/mouser.h +++ b/src/mame/includes/mouser.h @@ -35,10 +35,11 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void palette_init(); + UINT32 screen_update_mouser(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/mouser.c -----------*/ -SCREEN_UPDATE_IND16( mouser ); + diff --git a/src/mame/includes/mrdo.h b/src/mame/includes/mrdo.h index e8a804f47c3..521cb213237 100644 --- a/src/mame/includes/mrdo.h +++ b/src/mame/includes/mrdo.h @@ -32,6 +32,7 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_mrdo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -40,4 +41,4 @@ public: -SCREEN_UPDATE_IND16( mrdo ); + diff --git a/src/mame/includes/mrflea.h b/src/mame/includes/mrflea.h index 12b934f448f..a7aa0c9274e 100644 --- a/src/mame/includes/mrflea.h +++ b/src/mame/includes/mrflea.h @@ -44,10 +44,11 @@ public: DECLARE_WRITE8_MEMBER(mrflea_spriteram_w); virtual void machine_start(); virtual void machine_reset(); + UINT32 screen_update_mrflea(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/mrflea.c -----------*/ -SCREEN_UPDATE_IND16( mrflea ); + diff --git a/src/mame/includes/mrjong.h b/src/mame/includes/mrjong.h index 0f690203776..20d5ff2d8c1 100644 --- a/src/mame/includes/mrjong.h +++ b/src/mame/includes/mrjong.h @@ -25,6 +25,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_mrjong(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -33,4 +34,4 @@ public: -SCREEN_UPDATE_IND16( mrjong ); + diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h index 9a5e11510a3..f024bf895e5 100644 --- a/src/mame/includes/ms32.h +++ b/src/mame/includes/ms32.h @@ -87,6 +87,7 @@ public: virtual void machine_reset(); virtual void video_start(); DECLARE_VIDEO_START(f1superb); + UINT32 screen_update_ms32(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -98,4 +99,4 @@ public: -SCREEN_UPDATE_RGB32( ms32 ); + diff --git a/src/mame/includes/msisaac.h b/src/mame/includes/msisaac.h index 7777bc45e40..083c1445309 100644 --- a/src/mame/includes/msisaac.h +++ b/src/mame/includes/msisaac.h @@ -72,6 +72,7 @@ public: virtual void machine_reset(); virtual void video_start(); DECLARE_MACHINE_RESET(ta7630); + UINT32 screen_update_msisaac(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -79,5 +80,5 @@ public: -SCREEN_UPDATE_IND16( msisaac ); + diff --git a/src/mame/includes/mugsmash.h b/src/mame/includes/mugsmash.h index 66365f244d7..162f04397d5 100644 --- a/src/mame/includes/mugsmash.h +++ b/src/mame/includes/mugsmash.h @@ -30,11 +30,12 @@ public: TILE_GET_INFO_MEMBER(get_mugsmash_tile_info2); virtual void machine_start(); virtual void video_start(); + UINT32 screen_update_mugsmash(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/mugsmash.c -----------*/ -SCREEN_UPDATE_IND16( mugsmash ); + diff --git a/src/mame/includes/munchmo.h b/src/mame/includes/munchmo.h index 1a80270efe1..a89d68e9aef 100644 --- a/src/mame/includes/munchmo.h +++ b/src/mame/includes/munchmo.h @@ -46,6 +46,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_mnchmobl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -54,4 +55,4 @@ public: -SCREEN_UPDATE_IND16( mnchmobl ); + diff --git a/src/mame/includes/mustache.h b/src/mame/includes/mustache.h index 272af74622d..e1bd0f7004f 100644 --- a/src/mame/includes/mustache.h +++ b/src/mame/includes/mustache.h @@ -19,11 +19,12 @@ public: virtual void machine_start(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_mustache(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/mustache.c -----------*/ -SCREEN_UPDATE_IND16( mustache ); + diff --git a/src/mame/includes/mw8080bw.h b/src/mame/includes/mw8080bw.h index 7da148cb438..56a5e8306cb 100644 --- a/src/mame/includes/mw8080bw.h +++ b/src/mame/includes/mw8080bw.h @@ -139,6 +139,11 @@ public: DECLARE_MACHINE_START(spcenctr); DECLARE_MACHINE_START(phantom2); DECLARE_MACHINE_START(invaders); + UINT32 screen_update_mw8080bw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_spcenctr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_phantom2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_invaders(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void screen_eof_phantom2(screen_device &screen, bool state); }; @@ -271,11 +276,11 @@ DECLARE_WRITE8_DEVICE_HANDLER( invad2ct_audio_4_w ); /*----------- defined in video/mw8080bw.c -----------*/ -SCREEN_UPDATE_RGB32( mw8080bw ); -SCREEN_UPDATE_RGB32( spcenctr ); -SCREEN_UPDATE_RGB32( phantom2 ); -SCREEN_VBLANK( phantom2 ); -SCREEN_UPDATE_RGB32( invaders ); + + + + + diff --git a/src/mame/includes/mystston.h b/src/mame/includes/mystston.h index c1c43040f78..c7a9e9f312b 100644 --- a/src/mame/includes/mystston.h +++ b/src/mame/includes/mystston.h @@ -46,6 +46,7 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); DECLARE_VIDEO_START(mystston); DECLARE_VIDEO_RESET(mystston); + UINT32 screen_update_mystston(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h index 3ea0f031a8e..5111aeacd67 100644 --- a/src/mame/includes/mystwarr.h +++ b/src/mame/includes/mystwarr.h @@ -67,6 +67,10 @@ public: DECLARE_VIDEO_START(gaiapols); DECLARE_MACHINE_RESET(martchmp); DECLARE_VIDEO_START(martchmp); + UINT32 screen_update_mystwarr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_metamrph(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_dadandrn(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_martchmp(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -78,8 +82,8 @@ public: -SCREEN_UPDATE_RGB32( dadandrn ); -SCREEN_UPDATE_RGB32( mystwarr ); -SCREEN_UPDATE_RGB32( metamrph ); -SCREEN_UPDATE_RGB32( martchmp ); + + + + diff --git a/src/mame/includes/n64.h b/src/mame/includes/n64.h index c73b63b0a3e..3fd20db8fb3 100644 --- a/src/mame/includes/n64.h +++ b/src/mame/includes/n64.h @@ -23,6 +23,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_n64(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- devices -----------*/ diff --git a/src/mame/includes/n8080.h b/src/mame/includes/n8080.h index 8b670a66aae..d54cea50f0c 100644 --- a/src/mame/includes/n8080.h +++ b/src/mame/includes/n8080.h @@ -77,6 +77,10 @@ public: DECLARE_MACHINE_RESET(helifire_sound); DECLARE_MACHINE_START(n8080); DECLARE_MACHINE_RESET(n8080); + UINT32 screen_update_spacefev(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_sheriff(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_helifire(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_helifire(screen_device &screen, bool state); }; @@ -90,10 +94,10 @@ public: -SCREEN_UPDATE_IND16( spacefev ); -SCREEN_UPDATE_IND16( sheriff ); -SCREEN_UPDATE_IND16( helifire ); -SCREEN_VBLANK( helifire ); + + + + void spacefev_start_red_cannon(running_machine &machine); diff --git a/src/mame/includes/namcofl.h b/src/mame/includes/namcofl.h index d03346d2813..9267a0918c0 100644 --- a/src/mame/includes/namcofl.h +++ b/src/mame/includes/namcofl.h @@ -57,11 +57,12 @@ public: DECLARE_MACHINE_START(namcofl); DECLARE_MACHINE_RESET(namcofl); DECLARE_VIDEO_START(namcofl); + UINT32 screen_update_namcofl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/namcofl.c -----------*/ -SCREEN_UPDATE_IND16( namcofl ); + diff --git a/src/mame/includes/namcona1.h b/src/mame/includes/namcona1.h index 3a57fdd7fa6..289bbb5077e 100644 --- a/src/mame/includes/namcona1.h +++ b/src/mame/includes/namcona1.h @@ -110,6 +110,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_namcona1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/namconb1.h b/src/mame/includes/namconb1.h index 360171ffe53..11b03b3edae 100644 --- a/src/mame/includes/namconb1.h +++ b/src/mame/includes/namconb1.h @@ -75,13 +75,15 @@ public: DECLARE_MACHINE_START(namconb); DECLARE_VIDEO_START(namconb1); DECLARE_VIDEO_START(namconb2); + UINT32 screen_update_namconb1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_namconb2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/namconb1.c -----------*/ -SCREEN_UPDATE_IND16( namconb1 ); -SCREEN_UPDATE_IND16( namconb2 ); + + diff --git a/src/mame/includes/namcos1.h b/src/mame/includes/namcos1.h index 63b14669bc8..d0eac79f5ae 100644 --- a/src/mame/includes/namcos1.h +++ b/src/mame/includes/namcos1.h @@ -93,6 +93,8 @@ public: TILE_GET_INFO_MEMBER(fg_get_info5); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_namcos1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_namcos1(screen_device &screen, bool state); }; @@ -118,5 +120,5 @@ DECLARE_READ8_HANDLER( namcos1_spriteram_r ); DECLARE_WRITE8_HANDLER( namcos1_spriteram_w ); -SCREEN_UPDATE_IND16( namcos1 ); -SCREEN_VBLANK( namcos1 ); + + diff --git a/src/mame/includes/namcos21.h b/src/mame/includes/namcos21.h index 252b985e0d7..4c20c29d608 100644 --- a/src/mame/includes/namcos21.h +++ b/src/mame/includes/namcos21.h @@ -154,6 +154,7 @@ public: DECLARE_DRIVER_INIT(aircomb); DECLARE_MACHINE_START(namcos21); DECLARE_VIDEO_START(namcos21); + UINT32 screen_update_namcos21(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h index 8b52c66025c..f4db51d2ed0 100644 --- a/src/mame/includes/namcos22.h +++ b/src/mame/includes/namcos22.h @@ -254,16 +254,18 @@ public: DECLARE_VIDEO_START(namcos22s); DECLARE_VIDEO_START(namcos22); DECLARE_VIDEO_START(common); + UINT32 screen_update_namcos22s(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_namcos22(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/namcos22.c -----------*/ -SCREEN_UPDATE_RGB32( namcos22 ); -SCREEN_UPDATE_RGB32( namcos22s ); + + void namcos22_draw_direct_poly( running_machine &machine, const UINT16 *pSource ); UINT32 namcos22_point_rom_r( running_machine &machine, offs_t offs ); diff --git a/src/mame/includes/namcos86.h b/src/mame/includes/namcos86.h index e0445915ced..656215bc047 100644 --- a/src/mame/includes/namcos86.h +++ b/src/mame/includes/namcos86.h @@ -52,6 +52,8 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_namcos86(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_namcos86(screen_device &screen, bool state); }; @@ -59,6 +61,6 @@ public: -SCREEN_UPDATE_IND16( namcos86 ); -SCREEN_VBLANK( namcos86 ); + + diff --git a/src/mame/includes/naughtyb.h b/src/mame/includes/naughtyb.h index f079e33db0b..ff5fcd286ec 100644 --- a/src/mame/includes/naughtyb.h +++ b/src/mame/includes/naughtyb.h @@ -31,6 +31,7 @@ public: DECLARE_DRIVER_INIT(popflame); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_naughtyb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -39,4 +40,4 @@ public: -SCREEN_UPDATE_IND16( naughtyb ); + diff --git a/src/mame/includes/nbmj8688.h b/src/mame/includes/nbmj8688.h index ca7b964195e..d403b224752 100644 --- a/src/mame/includes/nbmj8688.h +++ b/src/mame/includes/nbmj8688.h @@ -87,6 +87,9 @@ public: DECLARE_VIDEO_START(mbmj8688_hybrid_16bit); DECLARE_VIDEO_START(mbmj8688_hybrid_12bit); DECLARE_VIDEO_START(mbmj8688_pure_16bit); + UINT32 screen_update_mbmj8688(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_mbmj8688_lcd0(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_mbmj8688_lcd1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -95,9 +98,9 @@ public: -SCREEN_UPDATE_IND16( mbmj8688 ); -SCREEN_UPDATE_IND16( mbmj8688_lcd0 ); -SCREEN_UPDATE_IND16( mbmj8688_lcd1 ); + + + diff --git a/src/mame/includes/nbmj8891.h b/src/mame/includes/nbmj8891.h index 765fbd89ec0..42aac38df32 100644 --- a/src/mame/includes/nbmj8891.h +++ b/src/mame/includes/nbmj8891.h @@ -73,12 +73,13 @@ public: DECLARE_DRIVER_INIT(maiko); virtual void video_start(); DECLARE_VIDEO_START(nbmj8891_1layer); + UINT32 screen_update_nbmj8891(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/nbmj8891.c -----------*/ -SCREEN_UPDATE_IND16( nbmj8891 ); + diff --git a/src/mame/includes/nbmj8900.h b/src/mame/includes/nbmj8900.h index 7dfe9e09676..0227bebfa76 100644 --- a/src/mame/includes/nbmj8900.h +++ b/src/mame/includes/nbmj8900.h @@ -44,11 +44,12 @@ public: DECLARE_DRIVER_INIT(togenkyo); DECLARE_DRIVER_INIT(ohpaipee); virtual void video_start(); + UINT32 screen_update_nbmj8900(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/nbmj8900.c -----------*/ -SCREEN_UPDATE_IND16( nbmj8900 ); + diff --git a/src/mame/includes/nbmj8991.h b/src/mame/includes/nbmj8991.h index 60e430ae221..c4f01981abf 100644 --- a/src/mame/includes/nbmj8991.h +++ b/src/mame/includes/nbmj8991.h @@ -51,12 +51,14 @@ public: DECLARE_DRIVER_INIT(qmhayaku); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_nbmj8991_type1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_nbmj8991_type2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/nbmj8991.c -----------*/ -SCREEN_UPDATE_IND16( nbmj8991_type1 ); -SCREEN_UPDATE_IND16( nbmj8991_type2 ); + + diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h index e18c10d259f..1bbbc47df14 100644 --- a/src/mame/includes/nbmj9195.h +++ b/src/mame/includes/nbmj9195.h @@ -110,12 +110,13 @@ public: virtual void video_start(); DECLARE_VIDEO_START(nbmj9195_1layer); DECLARE_VIDEO_START(nbmj9195_nb22090); + UINT32 screen_update_nbmj9195(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/nbmj9195.c -----------*/ -SCREEN_UPDATE_IND16( nbmj9195 ); + diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h index d99d8c7e58c..9c85f6c6b0a 100644 --- a/src/mame/includes/nemesis.h +++ b/src/mame/includes/nemesis.h @@ -84,6 +84,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_nemesis(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -92,4 +93,4 @@ public: -SCREEN_UPDATE_IND16( nemesis ); + diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h index 731d5847e33..7ca5dae0df9 100644 --- a/src/mame/includes/neogeo.h +++ b/src/mame/includes/neogeo.h @@ -207,6 +207,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void video_reset(); + UINT32 screen_update_neogeo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -308,7 +309,7 @@ void matrimbl_decrypt(running_machine &machine); -SCREEN_UPDATE_RGB32( neogeo ); + void neogeo_set_palette_bank(running_machine &machine, UINT8 data); diff --git a/src/mame/includes/news.h b/src/mame/includes/news.h index 234753e5dad..eac5e30f269 100644 --- a/src/mame/includes/news.h +++ b/src/mame/includes/news.h @@ -24,6 +24,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_news(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -31,4 +32,4 @@ public: -SCREEN_UPDATE_IND16( news ); + diff --git a/src/mame/includes/ninjakd2.h b/src/mame/includes/ninjakd2.h index 202e4fce064..ce95f779a2b 100644 --- a/src/mame/includes/ninjakd2.h +++ b/src/mame/includes/ninjakd2.h @@ -72,6 +72,10 @@ public: DECLARE_VIDEO_START(robokid); DECLARE_MACHINE_RESET(omegaf); DECLARE_VIDEO_START(omegaf); + UINT32 screen_update_ninjakd2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_robokid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_omegaf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_ninjakd2(screen_device &screen, bool state); }; diff --git a/src/mame/includes/ninjaw.h b/src/mame/includes/ninjaw.h index 9bdc574d5dc..383654d3739 100644 --- a/src/mame/includes/ninjaw.h +++ b/src/mame/includes/ninjaw.h @@ -43,12 +43,15 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_ninjaw_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_ninjaw_middle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_ninjaw_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/ninjaw.c -----------*/ -SCREEN_UPDATE_IND16( ninjaw_left ); -SCREEN_UPDATE_IND16( ninjaw_middle ); -SCREEN_UPDATE_IND16( ninjaw_right ); + + + diff --git a/src/mame/includes/nitedrvr.h b/src/mame/includes/nitedrvr.h index e1054f41872..378a853f0e3 100644 --- a/src/mame/includes/nitedrvr.h +++ b/src/mame/includes/nitedrvr.h @@ -56,6 +56,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_nitedrvr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -77,4 +78,4 @@ DISCRETE_SOUND_EXTERN( nitedrvr ); -SCREEN_UPDATE_IND16( nitedrvr ); + diff --git a/src/mame/includes/niyanpai.h b/src/mame/includes/niyanpai.h index d2df48f8008..ba0bbe2c4c9 100644 --- a/src/mame/includes/niyanpai.h +++ b/src/mame/includes/niyanpai.h @@ -79,12 +79,13 @@ public: DECLARE_DRIVER_INIT(niyanpai); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_niyanpai(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/niyanpai.c -----------*/ -SCREEN_UPDATE_IND16( niyanpai ); + diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h index 79ae1d6677b..92cae50ff1c 100644 --- a/src/mame/includes/nmk16.h +++ b/src/mame/includes/nmk16.h @@ -127,6 +127,21 @@ public: DECLARE_VIDEO_START(afega); DECLARE_VIDEO_START(firehawk); DECLARE_VIDEO_START(grdnstrm); + UINT32 screen_update_tharrier(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_manybloc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_macross(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_bioship(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_strahl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_gunnail(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_tdragon2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_bjtwin(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_afega(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_firehawk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_redhawki(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_redhawkb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_bubl2000(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_nmk(screen_device &screen, bool state); + void screen_eof_strahl(screen_device &screen, bool state); }; @@ -141,22 +156,22 @@ public: -SCREEN_UPDATE_IND16( macross ); -SCREEN_UPDATE_IND16( manybloc ); -SCREEN_UPDATE_IND16( tharrier ); -SCREEN_UPDATE_IND16( tdragon2 ); -SCREEN_UPDATE_IND16( gunnail ); -SCREEN_UPDATE_IND16( bioship ); -SCREEN_UPDATE_IND16( strahl ); -SCREEN_UPDATE_IND16( bjtwin ); -SCREEN_VBLANK( nmk ); -SCREEN_VBLANK( strahl ); -SCREEN_UPDATE_IND16( afega ); -SCREEN_UPDATE_IND16( redhawkb ); -SCREEN_UPDATE_IND16(redhawki ); -SCREEN_UPDATE_IND16( bubl2000 ); -SCREEN_UPDATE_IND16( firehawk ); + + + + + + + + + + + + + + + diff --git a/src/mame/includes/norautp.h b/src/mame/includes/norautp.h index bebc4616313..5237ad1edc3 100644 --- a/src/mame/includes/norautp.h +++ b/src/mame/includes/norautp.h @@ -27,6 +27,7 @@ public: DECLARE_DRIVER_INIT(deb); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_norautp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/nova2001.h b/src/mame/includes/nova2001.h index 2ef3c84b52e..b8889ab1cf4 100644 --- a/src/mame/includes/nova2001.h +++ b/src/mame/includes/nova2001.h @@ -40,6 +40,10 @@ public: DECLARE_VIDEO_START(ninjakun); DECLARE_VIDEO_START(pkunwar); DECLARE_VIDEO_START(raiders5); + UINT32 screen_update_nova2001(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_ninjakun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_pkunwar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_raiders5(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/nycaptor.h b/src/mame/includes/nycaptor.h index 8327792f3d9..1254f7fe713 100644 --- a/src/mame/includes/nycaptor.h +++ b/src/mame/includes/nycaptor.h @@ -103,6 +103,7 @@ public: virtual void machine_reset(); virtual void video_start(); DECLARE_MACHINE_RESET(ta7630); + UINT32 screen_update_nycaptor(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -116,4 +117,4 @@ public: -SCREEN_UPDATE_IND16( nycaptor ); + diff --git a/src/mame/includes/offtwall.h b/src/mame/includes/offtwall.h index 0770c479ac9..aa373463d08 100644 --- a/src/mame/includes/offtwall.h +++ b/src/mame/includes/offtwall.h @@ -33,10 +33,11 @@ public: DECLARE_MACHINE_START(offtwall); DECLARE_MACHINE_RESET(offtwall); DECLARE_VIDEO_START(offtwall); + UINT32 screen_update_offtwall(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/offtwall.c -----------*/ -SCREEN_UPDATE_IND16( offtwall ); + diff --git a/src/mame/includes/ohmygod.h b/src/mame/includes/ohmygod.h index 9c1341c97c0..31d9697f575 100644 --- a/src/mame/includes/ohmygod.h +++ b/src/mame/includes/ohmygod.h @@ -37,6 +37,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_ohmygod(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -44,4 +45,4 @@ public: -SCREEN_UPDATE_IND16( ohmygod ); + diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h index 51b3bf3f8df..6f3e4cbd0f0 100644 --- a/src/mame/includes/ojankohs.h +++ b/src/mame/includes/ojankohs.h @@ -70,6 +70,8 @@ public: DECLARE_MACHINE_START(ojankoc); DECLARE_VIDEO_START(ojankoc); DECLARE_MACHINE_START(common); + UINT32 screen_update_ojankohs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_ojankoc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -82,8 +84,8 @@ public: -SCREEN_UPDATE_IND16( ojankohs ); -SCREEN_UPDATE_IND16( ojankoc ); + + void ojankoc_flipscreen(address_space &space, int data); diff --git a/src/mame/includes/oneshot.h b/src/mame/includes/oneshot.h index 70e4004147b..680bfe95beb 100644 --- a/src/mame/includes/oneshot.h +++ b/src/mame/includes/oneshot.h @@ -49,11 +49,13 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_oneshot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_maddonna(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/oneshot.c -----------*/ -SCREEN_UPDATE_IND16( oneshot ); -SCREEN_UPDATE_IND16( maddonna ); + + diff --git a/src/mame/includes/opwolf.h b/src/mame/includes/opwolf.h index 7e55ecf67cf..9345d87b757 100644 --- a/src/mame/includes/opwolf.h +++ b/src/mame/includes/opwolf.h @@ -72,6 +72,7 @@ public: DECLARE_DRIVER_INIT(opwolfb); virtual void machine_start(); DECLARE_MACHINE_RESET(opwolf); + UINT32 screen_update_opwolf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -84,4 +85,4 @@ void opwolf_cchip_init(running_machine &machine); /*----------- defined in video/opwolf.c -----------*/ -SCREEN_UPDATE_IND16( opwolf ); + diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h index 152ea32f7f2..5fc00935ab9 100644 --- a/src/mame/includes/orbit.h +++ b/src/mame/includes/orbit.h @@ -43,6 +43,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_orbit(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -58,5 +59,5 @@ DISCRETE_SOUND_EXTERN( orbit ); /*----------- defined in video/orbit.c -----------*/ -SCREEN_UPDATE_IND16( orbit ); + diff --git a/src/mame/includes/othldrby.h b/src/mame/includes/othldrby.h index bdbdefd3ee7..1fce1a17a08 100644 --- a/src/mame/includes/othldrby.h +++ b/src/mame/includes/othldrby.h @@ -41,6 +41,8 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_othldrby(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_othldrby(screen_device &screen, bool state); }; @@ -48,5 +50,5 @@ public: -SCREEN_VBLANK( othldrby ); -SCREEN_UPDATE_IND16( othldrby ); + + diff --git a/src/mame/includes/othunder.h b/src/mame/includes/othunder.h index 717dc6e8269..ec5bbffb24e 100644 --- a/src/mame/includes/othunder.h +++ b/src/mame/includes/othunder.h @@ -62,10 +62,11 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_othunder(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/othunder.c -----------*/ -SCREEN_UPDATE_IND16( othunder ); + diff --git a/src/mame/includes/overdriv.h b/src/mame/includes/overdriv.h index ef28ac6c9bf..df2f74f58ba 100644 --- a/src/mame/includes/overdriv.h +++ b/src/mame/includes/overdriv.h @@ -42,6 +42,7 @@ public: DECLARE_READ8_MEMBER(overdriv_2_sound_r); virtual void machine_start(); virtual void machine_reset(); + UINT32 screen_update_overdriv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/overdriv.c -----------*/ @@ -50,4 +51,4 @@ extern void overdriv_sprite_callback(running_machine &machine, int *code,int *co extern void overdriv_zoom_callback_0(running_machine &machine, int *code,int *color,int *flags); extern void overdriv_zoom_callback_1(running_machine &machine, int *code,int *color,int *flags); -SCREEN_UPDATE_IND16( overdriv ); + diff --git a/src/mame/includes/pacland.h b/src/mame/includes/pacland.h index 20f7fef81c9..a13c62d590c 100644 --- a/src/mame/includes/pacland.h +++ b/src/mame/includes/pacland.h @@ -37,6 +37,7 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_pacland(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -45,4 +46,4 @@ public: -SCREEN_UPDATE_IND16( pacland ); + diff --git a/src/mame/includes/pacman.h b/src/mame/includes/pacman.h index c3ed83749f2..2cd71b9e07c 100644 --- a/src/mame/includes/pacman.h +++ b/src/mame/includes/pacman.h @@ -134,6 +134,8 @@ public: DECLARE_MACHINE_RESET(superabc); DECLARE_VIDEO_START(pengo); DECLARE_VIDEO_START(jrpacman); + UINT32 screen_update_pacman(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_s2650games(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -141,12 +143,12 @@ public: -SCREEN_UPDATE_IND16( pacman ); -SCREEN_UPDATE_IND16( s2650games ); + + diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h index 080e1383b3f..eb5e1685c9b 100644 --- a/src/mame/includes/pandoras.h +++ b/src/mame/includes/pandoras.h @@ -50,6 +50,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_pandoras(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -59,5 +60,5 @@ public: -SCREEN_UPDATE_IND16( pandoras ); + diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h index 25c4b75b45c..15ef9675b30 100644 --- a/src/mame/includes/paradise.h +++ b/src/mame/includes/paradise.h @@ -51,6 +51,9 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_paradise(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_torus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_madball(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/paradise.c -----------*/ @@ -60,6 +63,6 @@ public: -SCREEN_UPDATE_IND16( paradise ); -SCREEN_UPDATE_IND16( torus ); -SCREEN_UPDATE_IND16( madball ); + + + diff --git a/src/mame/includes/parodius.h b/src/mame/includes/parodius.h index eab4542bf7c..89e48be9a05 100644 --- a/src/mame/includes/parodius.h +++ b/src/mame/includes/parodius.h @@ -42,6 +42,7 @@ public: DECLARE_READ8_MEMBER(parodius_sound_r); virtual void machine_start(); virtual void machine_reset(); + UINT32 screen_update_parodius(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/parodius.c -----------*/ @@ -49,4 +50,4 @@ public: extern void parodius_tile_callback(running_machine &machine, int layer,int bank,int *code,int *color,int *flags,int *priority); extern void parodius_sprite_callback(running_machine &machine, int *code,int *color,int *priority_mask); -SCREEN_UPDATE_IND16( parodius ); + diff --git a/src/mame/includes/pass.h b/src/mame/includes/pass.h index 2c6ed102c2a..42ca7b4bbad 100644 --- a/src/mame/includes/pass.h +++ b/src/mame/includes/pass.h @@ -16,6 +16,7 @@ public: TILE_GET_INFO_MEMBER(get_pass_bg_tile_info); TILE_GET_INFO_MEMBER(get_pass_fg_tile_info); virtual void video_start(); + UINT32 screen_update_pass(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -23,4 +24,4 @@ public: -SCREEN_UPDATE_IND16( pass ); + diff --git a/src/mame/includes/pastelg.h b/src/mame/includes/pastelg.h index 4dd243e39ba..759690aa087 100644 --- a/src/mame/includes/pastelg.h +++ b/src/mame/includes/pastelg.h @@ -34,13 +34,14 @@ public: DECLARE_DRIVER_INIT(pastelg); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_pastelg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/pastelg.c -----------*/ -SCREEN_UPDATE_IND16( pastelg ); + diff --git a/src/mame/includes/pbaction.h b/src/mame/includes/pbaction.h index ed769309ecf..7d5c93a2242 100644 --- a/src/mame/includes/pbaction.h +++ b/src/mame/includes/pbaction.h @@ -51,6 +51,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_pbaction(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/pcktgal.h b/src/mame/includes/pcktgal.h index 0482b9d3fb7..8864998d53c 100644 --- a/src/mame/includes/pcktgal.h +++ b/src/mame/includes/pcktgal.h @@ -17,6 +17,8 @@ public: DECLARE_DRIVER_INIT(deco222); DECLARE_DRIVER_INIT(graphics); virtual void palette_init(); + UINT32 screen_update_pcktgal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_pcktgalb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -24,5 +26,5 @@ public: -SCREEN_UPDATE_IND16( pcktgal ); -SCREEN_UPDATE_IND16( pcktgalb ); + + diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h index dc0dab72abb..377c3fab332 100644 --- a/src/mame/includes/pgm.h +++ b/src/mame/includes/pgm.h @@ -114,6 +114,8 @@ public: DECLARE_VIDEO_START(pgm); DECLARE_MACHINE_START(pgm); DECLARE_MACHINE_RESET(pgm); + UINT32 screen_update_pgm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_pgm(screen_device &screen, bool state); }; @@ -429,5 +431,5 @@ INPUT_PORTS_EXTERN( olds ); -SCREEN_VBLANK( pgm ); -SCREEN_UPDATE_IND16( pgm ); + + diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h index f870b371934..4cf675a4115 100644 --- a/src/mame/includes/phoenix.h +++ b/src/mame/includes/phoenix.h @@ -35,6 +35,7 @@ public: DECLARE_PALETTE_INIT(phoenix); DECLARE_PALETTE_INIT(survival); DECLARE_PALETTE_INIT(pleiads); + UINT32 screen_update_phoenix(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -89,7 +90,7 @@ extern const device_type PHOENIX; -SCREEN_UPDATE_IND16( phoenix ); + DECLARE_READ8_DEVICE_HANDLER( survival_protection_r ); diff --git a/src/mame/includes/pingpong.h b/src/mame/includes/pingpong.h index 02733b7c414..ec649c0afe1 100644 --- a/src/mame/includes/pingpong.h +++ b/src/mame/includes/pingpong.h @@ -26,6 +26,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_pingpong(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -34,4 +35,4 @@ public: -SCREEN_UPDATE_IND16( pingpong ); + diff --git a/src/mame/includes/pirates.h b/src/mame/includes/pirates.h index c938b3d581e..c18b8cd61b8 100644 --- a/src/mame/includes/pirates.h +++ b/src/mame/includes/pirates.h @@ -29,6 +29,7 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); + UINT32 screen_update_pirates(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -36,4 +37,4 @@ public: -SCREEN_UPDATE_IND16( pirates ); + diff --git a/src/mame/includes/pitnrun.h b/src/mame/includes/pitnrun.h index 3996bdbba42..dd79eedb8ae 100644 --- a/src/mame/includes/pitnrun.h +++ b/src/mame/includes/pitnrun.h @@ -51,6 +51,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_pitnrun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -67,4 +68,4 @@ public: -SCREEN_UPDATE_IND16(pitnrun); + diff --git a/src/mame/includes/pktgaldx.h b/src/mame/includes/pktgaldx.h index b463e8e54dc..ce6f4539f55 100644 --- a/src/mame/includes/pktgaldx.h +++ b/src/mame/includes/pktgaldx.h @@ -32,11 +32,13 @@ public: DECLARE_WRITE16_MEMBER(pktgaldx_oki_bank_w); DECLARE_DRIVER_INIT(pktgaldx); virtual void machine_start(); + UINT32 screen_update_pktgaldx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_pktgaldb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/pktgaldx.c -----------*/ -SCREEN_UPDATE_IND16( pktgaldx ); -SCREEN_UPDATE_IND16( pktgaldb ); + + diff --git a/src/mame/includes/playch10.h b/src/mame/includes/playch10.h index 14633125296..5c8a368de7e 100644 --- a/src/mame/includes/playch10.h +++ b/src/mame/includes/playch10.h @@ -114,6 +114,9 @@ public: virtual void palette_init(); DECLARE_MACHINE_START(playch10_hboard); DECLARE_VIDEO_START(playch10_hboard); + UINT32 screen_update_playch10_top(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_playch10_bottom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_playch10_single(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -133,5 +136,5 @@ extern const ppu2c0x_interface playch10_ppu_interface_hboard; -SCREEN_UPDATE_IND16( playch10_top ); -SCREEN_UPDATE_IND16( playch10_bottom ); + + diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h index bce16c9475e..db2cf0e25e1 100644 --- a/src/mame/includes/playmark.h +++ b/src/mame/includes/playmark.h @@ -99,6 +99,12 @@ public: DECLARE_MACHINE_START(powerbal); DECLARE_MACHINE_RESET(powerbal); DECLARE_VIDEO_START(powerbal); + UINT32 screen_update_bigtwin(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_bigtwinb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_wbeachvl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_excelsr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_hrdtimes(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_powerbal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/playmark.c -----------*/ @@ -111,8 +117,8 @@ public: -SCREEN_UPDATE_IND16( bigtwin ); -SCREEN_UPDATE_IND16( bigtwinb ); -SCREEN_UPDATE_IND16( wbeachvl ); -SCREEN_UPDATE_IND16( excelsr ); -SCREEN_UPDATE_IND16( hrdtimes ); + + + + + diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h index 85eb60468dd..798428be90d 100644 --- a/src/mame/includes/plygonet.h +++ b/src/mame/includes/plygonet.h @@ -72,10 +72,11 @@ public: TILEMAP_MAPPER_MEMBER(plygonet_scan_cols); virtual void machine_start(); virtual void video_start(); + UINT32 screen_update_polygonet(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/plygonet.c -----------*/ -SCREEN_UPDATE_IND16( polygonet ); + diff --git a/src/mame/includes/pokechmp.h b/src/mame/includes/pokechmp.h index 5fbf747cec6..94cc973b83e 100644 --- a/src/mame/includes/pokechmp.h +++ b/src/mame/includes/pokechmp.h @@ -17,6 +17,7 @@ public: DECLARE_DRIVER_INIT(pokechmp); TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); + UINT32 screen_update_pokechmp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -24,4 +25,4 @@ public: -SCREEN_UPDATE_IND16( pokechmp ); + diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h index da97e8d11bb..fccf1f0e903 100644 --- a/src/mame/includes/polepos.h +++ b/src/mame/includes/polepos.h @@ -79,6 +79,7 @@ public: DECLARE_MACHINE_RESET(polepos); DECLARE_VIDEO_START(polepos); DECLARE_PALETTE_INIT(polepos); + UINT32 screen_update_polepos(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -119,6 +120,6 @@ DISCRETE_SOUND_EXTERN( polepos ); -SCREEN_UPDATE_IND16( polepos ); + diff --git a/src/mame/includes/policetr.h b/src/mame/includes/policetr.h index 93daebe8a3d..068c02f5a23 100644 --- a/src/mame/includes/policetr.h +++ b/src/mame/includes/policetr.h @@ -46,6 +46,7 @@ public: DECLARE_DRIVER_INIT(sshooter); DECLARE_DRIVER_INIT(plctr13b); virtual void video_start(); + UINT32 screen_update_policetr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -54,4 +55,4 @@ public: -SCREEN_UPDATE_IND16( policetr ); + diff --git a/src/mame/includes/polyplay.h b/src/mame/includes/polyplay.h index d8e303e9c47..77e9e0d2d42 100644 --- a/src/mame/includes/polyplay.h +++ b/src/mame/includes/polyplay.h @@ -32,6 +32,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_polyplay(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -48,4 +49,4 @@ SAMPLES_START( polyplay_sh_start ); -SCREEN_UPDATE_IND16( polyplay ); + diff --git a/src/mame/includes/poolshrk.h b/src/mame/includes/poolshrk.h index 4a5702eef5e..869d15b6102 100644 --- a/src/mame/includes/poolshrk.h +++ b/src/mame/includes/poolshrk.h @@ -31,6 +31,7 @@ public: TILE_GET_INFO_MEMBER(get_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_poolshrk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -47,5 +48,5 @@ DISCRETE_SOUND_EXTERN( poolshrk ); /*----------- defined in video/poolshrk.c -----------*/ -SCREEN_UPDATE_IND16( poolshrk ); + diff --git a/src/mame/includes/pooyan.h b/src/mame/includes/pooyan.h index 62c7edd0bc9..a954ab7f23e 100644 --- a/src/mame/includes/pooyan.h +++ b/src/mame/includes/pooyan.h @@ -32,6 +32,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_pooyan(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -40,4 +41,4 @@ public: -SCREEN_UPDATE_IND16( pooyan ); + diff --git a/src/mame/includes/popeye.h b/src/mame/includes/popeye.h index 4a7d5be62ce..31a541f815c 100644 --- a/src/mame/includes/popeye.h +++ b/src/mame/includes/popeye.h @@ -40,6 +40,7 @@ public: virtual void palette_init(); DECLARE_VIDEO_START(popeye); DECLARE_PALETTE_INIT(popeyebl); + UINT32 screen_update_popeye(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -50,4 +51,4 @@ public: -SCREEN_UPDATE_IND16( popeye ); + diff --git a/src/mame/includes/popper.h b/src/mame/includes/popper.h index 08c888d5231..ad2573205df 100644 --- a/src/mame/includes/popper.h +++ b/src/mame/includes/popper.h @@ -54,6 +54,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_popper(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -62,5 +63,5 @@ public: -SCREEN_UPDATE_IND16( popper ); + diff --git a/src/mame/includes/portrait.h b/src/mame/includes/portrait.h index 0e9612dc006..622e192fa92 100644 --- a/src/mame/includes/portrait.h +++ b/src/mame/includes/portrait.h @@ -22,6 +22,7 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_portrait(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -29,4 +30,4 @@ public: -SCREEN_UPDATE_IND16( portrait ); + diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h index 8b7efe035d3..ff549682f42 100644 --- a/src/mame/includes/powerins.h +++ b/src/mame/includes/powerins.h @@ -30,6 +30,7 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_1); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_powerins(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -39,4 +40,4 @@ public: -SCREEN_UPDATE_IND16( powerins ); + diff --git a/src/mame/includes/prehisle.h b/src/mame/includes/prehisle.h index 841ef34ccb6..6d789652bfd 100644 --- a/src/mame/includes/prehisle.h +++ b/src/mame/includes/prehisle.h @@ -27,6 +27,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); virtual void video_start(); + UINT32 screen_update_prehisle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -34,4 +35,4 @@ public: -SCREEN_UPDATE_IND16( prehisle ); + diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h index 47894006c24..3c4f3bdab9a 100644 --- a/src/mame/includes/psikyo.h +++ b/src/mame/includes/psikyo.h @@ -89,6 +89,9 @@ public: virtual void machine_reset(); DECLARE_VIDEO_START(sngkace); DECLARE_VIDEO_START(psikyo); + UINT32 screen_update_psikyo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_psikyo_bootleg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_psikyo(screen_device &screen, bool state); }; @@ -99,6 +102,6 @@ void psikyo_switch_banks(running_machine &machine, int tmap, int bank); -SCREEN_UPDATE_IND16( psikyo ); -SCREEN_UPDATE_IND16( psikyo_bootleg ); -SCREEN_VBLANK( psikyo ); + + + diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h index 3600465fe0c..29543d0ceb1 100644 --- a/src/mame/includes/psikyo4.h +++ b/src/mame/includes/psikyo4.h @@ -50,11 +50,13 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_psikyo4_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_psikyo4_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/psikyo4.c -----------*/ -SCREEN_UPDATE_IND16( psikyo4_left ); -SCREEN_UPDATE_IND16( psikyo4_right ); + + diff --git a/src/mame/includes/psikyosh.h b/src/mame/includes/psikyosh.h index da9a5e7437e..47562bd41ae 100644 --- a/src/mame/includes/psikyosh.h +++ b/src/mame/includes/psikyosh.h @@ -65,10 +65,11 @@ public: DECLARE_DRIVER_INIT(s1945ii); virtual void machine_start(); virtual void video_start(); + UINT32 screen_update_psikyosh(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/psikyosh.c -----------*/ -SCREEN_UPDATE_RGB32( psikyosh ); -SCREEN_VBLANK( psikyosh ); + + diff --git a/src/mame/includes/psychic5.h b/src/mame/includes/psychic5.h index 8ab2988b2b9..e896ba0c01e 100644 --- a/src/mame/includes/psychic5.h +++ b/src/mame/includes/psychic5.h @@ -45,6 +45,8 @@ public: DECLARE_VIDEO_RESET(psychic5); DECLARE_VIDEO_START(bombsa); DECLARE_VIDEO_RESET(bombsa); + UINT32 screen_update_psychic5(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_bombsa(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -54,9 +56,9 @@ public: -SCREEN_UPDATE_RGB32( psychic5 ); -SCREEN_UPDATE_RGB32( bombsa ); + + diff --git a/src/mame/includes/punchout.h b/src/mame/includes/punchout.h index 3d7c378f08a..8567f4e7f51 100644 --- a/src/mame/includes/punchout.h +++ b/src/mame/includes/punchout.h @@ -63,6 +63,10 @@ public: virtual void machine_reset(); virtual void video_start(); DECLARE_VIDEO_START(armwrest); + UINT32 screen_update_punchout_top(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_punchout_bottom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_armwrest_top(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_armwrest_bottom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -71,8 +75,8 @@ public: -SCREEN_UPDATE_IND16( punchout_top ); -SCREEN_UPDATE_IND16( punchout_bottom ); -SCREEN_UPDATE_IND16( armwrest_top ); -SCREEN_UPDATE_IND16( armwrest_bottom ); + + + + diff --git a/src/mame/includes/pushman.h b/src/mame/includes/pushman.h index f65f5bf4ec6..b1362c78b57 100644 --- a/src/mame/includes/pushman.h +++ b/src/mame/includes/pushman.h @@ -48,6 +48,7 @@ public: virtual void video_start(); DECLARE_MACHINE_RESET(pushman); DECLARE_MACHINE_RESET(bballs); + UINT32 screen_update_pushman(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -56,4 +57,4 @@ public: -SCREEN_UPDATE_IND16( pushman ); + diff --git a/src/mame/includes/qdrmfgp.h b/src/mame/includes/qdrmfgp.h index a386b8d0953..534a380fa18 100644 --- a/src/mame/includes/qdrmfgp.h +++ b/src/mame/includes/qdrmfgp.h @@ -38,13 +38,14 @@ public: DECLARE_VIDEO_START(qdrmfgp); DECLARE_MACHINE_START(qdrmfgp2); DECLARE_VIDEO_START(qdrmfgp2); + UINT32 screen_update_qdrmfgp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/qdrmfgp.c -----------*/ -SCREEN_UPDATE_IND16( qdrmfgp ); + void qdrmfgp_tile_callback(running_machine &machine, int layer, int *code, int *color, int *flags); void qdrmfgp2_tile_callback(running_machine &machine, int layer, int *code, int *color, int *flags); diff --git a/src/mame/includes/quasar.h b/src/mame/includes/quasar.h index aa3f1f654d9..981a14f0884 100644 --- a/src/mame/includes/quasar.h +++ b/src/mame/includes/quasar.h @@ -28,11 +28,12 @@ public: DECLARE_MACHINE_RESET(quasar); DECLARE_VIDEO_START(quasar); DECLARE_PALETTE_INIT(quasar); + UINT32 screen_update_quasar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/quasar.c -----------*/ -SCREEN_UPDATE_IND16( quasar ); + diff --git a/src/mame/includes/quizdna.h b/src/mame/includes/quizdna.h index 7ff554d8047..0f986dae3d2 100644 --- a/src/mame/includes/quizdna.h +++ b/src/mame/includes/quizdna.h @@ -24,12 +24,13 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); virtual void video_start(); + UINT32 screen_update_quizdna(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/quizdna.c -----------*/ -SCREEN_UPDATE_IND16( quizdna ); + diff --git a/src/mame/includes/quizpani.h b/src/mame/includes/quizpani.h index a95c44d410d..4bc4facf33c 100644 --- a/src/mame/includes/quizpani.h +++ b/src/mame/includes/quizpani.h @@ -21,6 +21,7 @@ public: TILE_GET_INFO_MEMBER(bg_tile_info); TILE_GET_INFO_MEMBER(txt_tile_info); virtual void video_start(); + UINT32 screen_update_quizpani(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -28,4 +29,4 @@ public: -SCREEN_UPDATE_IND16( quizpani ); + diff --git a/src/mame/includes/raiden.h b/src/mame/includes/raiden.h index 288288cbffc..8e5144ad717 100644 --- a/src/mame/includes/raiden.h +++ b/src/mame/includes/raiden.h @@ -39,6 +39,7 @@ public: TILE_GET_INFO_MEMBER(get_text_tile_info); virtual void video_start(); DECLARE_VIDEO_START(raidena); + UINT32 screen_update_raiden(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -46,4 +47,4 @@ public: -SCREEN_UPDATE_IND16( raiden ); + diff --git a/src/mame/includes/raiden2.h b/src/mame/includes/raiden2.h index 366f22c1ac7..a23fcd9c615 100644 --- a/src/mame/includes/raiden2.h +++ b/src/mame/includes/raiden2.h @@ -148,6 +148,7 @@ public: DECLARE_MACHINE_RESET(zeroteam); DECLARE_MACHINE_RESET(xsedae); DECLARE_MACHINE_RESET(raidendx); + UINT32 screen_update_raiden2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/rainbow.h b/src/mame/includes/rainbow.h index 891cec7520c..61845516b5d 100644 --- a/src/mame/includes/rainbow.h +++ b/src/mame/includes/rainbow.h @@ -47,6 +47,8 @@ public: DECLARE_DRIVER_INIT(rbisland); virtual void machine_start(); DECLARE_VIDEO_START(jumping); + UINT32 screen_update_rainbow(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_jumping(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -57,7 +59,7 @@ void rbisland_cchip_init(running_machine &machine, int version); /*----------- defined in video/rainbow.c -----------*/ -SCREEN_UPDATE_IND16( rainbow ); -SCREEN_UPDATE_IND16( jumping ); + + diff --git a/src/mame/includes/rallyx.h b/src/mame/includes/rallyx.h index b4e1ad021af..5596fc2bd73 100644 --- a/src/mame/includes/rallyx.h +++ b/src/mame/includes/rallyx.h @@ -61,6 +61,9 @@ public: DECLARE_PALETTE_INIT(jungler); DECLARE_VIDEO_START(locomotn); DECLARE_VIDEO_START(commsega); + UINT32 screen_update_rallyx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_jungler(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_locomotn(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -73,6 +76,6 @@ public: -SCREEN_UPDATE_IND16( rallyx ); -SCREEN_UPDATE_IND16( jungler ); -SCREEN_UPDATE_IND16( locomotn ); + + + diff --git a/src/mame/includes/rampart.h b/src/mame/includes/rampart.h index d7ef5466c2e..cd5b4cc21a6 100644 --- a/src/mame/includes/rampart.h +++ b/src/mame/includes/rampart.h @@ -20,10 +20,11 @@ public: DECLARE_MACHINE_START(rampart); DECLARE_MACHINE_RESET(rampart); DECLARE_VIDEO_START(rampart); + UINT32 screen_update_rampart(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/rampart.c -----------*/ -SCREEN_UPDATE_IND16( rampart ); + diff --git a/src/mame/includes/rastan.h b/src/mame/includes/rastan.h index 654f464576b..3601ba9a0a6 100644 --- a/src/mame/includes/rastan.h +++ b/src/mame/includes/rastan.h @@ -33,10 +33,11 @@ public: DECLARE_WRITE8_MEMBER(rastan_msm5205_stop_w); virtual void machine_start(); virtual void machine_reset(); + UINT32 screen_update_rastan(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/rastan.c -----------*/ -SCREEN_UPDATE_IND16( rastan ); + diff --git a/src/mame/includes/realbrk.h b/src/mame/includes/realbrk.h index eef4200d951..3a9d48b8a29 100644 --- a/src/mame/includes/realbrk.h +++ b/src/mame/includes/realbrk.h @@ -44,6 +44,8 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_1); TILE_GET_INFO_MEMBER(get_tile_info_2); virtual void video_start(); + UINT32 screen_update_realbrk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_dai2kaku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -53,8 +55,8 @@ public: #define REALBRK_H -SCREEN_UPDATE_IND16(realbrk); -SCREEN_UPDATE_IND16(dai2kaku); + + diff --git a/src/mame/includes/redalert.h b/src/mame/includes/redalert.h index 8b873b1374f..8da32a24295 100644 --- a/src/mame/includes/redalert.h +++ b/src/mame/includes/redalert.h @@ -37,6 +37,9 @@ public: DECLARE_WRITE8_MEMBER(demoneye_audio_command_w); DECLARE_VIDEO_START(redalert); DECLARE_VIDEO_START(ww3); + UINT32 screen_update_redalert(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_demoneye(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_panther(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/relief.h b/src/mame/includes/relief.h index a61e5071a20..757a10fcbc2 100644 --- a/src/mame/includes/relief.h +++ b/src/mame/includes/relief.h @@ -26,10 +26,11 @@ public: DECLARE_MACHINE_START(relief); DECLARE_MACHINE_RESET(relief); DECLARE_VIDEO_START(relief); + UINT32 screen_update_relief(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/relief.c -----------*/ -SCREEN_UPDATE_IND16( relief ); + diff --git a/src/mame/includes/renegade.h b/src/mame/includes/renegade.h index c4f70f47a71..d0e2c02c366 100644 --- a/src/mame/includes/renegade.h +++ b/src/mame/includes/renegade.h @@ -72,10 +72,11 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_renegade(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/renegade.c -----------*/ -SCREEN_UPDATE_IND16( renegade ); + diff --git a/src/mame/includes/retofinv.h b/src/mame/includes/retofinv.h index b185def5ec0..ef09822a8bc 100644 --- a/src/mame/includes/retofinv.h +++ b/src/mame/includes/retofinv.h @@ -61,6 +61,7 @@ public: TILE_GET_INFO_MEMBER(fg_get_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_retofinv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -72,4 +73,4 @@ public: -SCREEN_UPDATE_IND16( retofinv ); + diff --git a/src/mame/includes/rltennis.h b/src/mame/includes/rltennis.h index e66766090a3..aa72e6d8f95 100644 --- a/src/mame/includes/rltennis.h +++ b/src/mame/includes/rltennis.h @@ -46,10 +46,11 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_rltennis(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; -SCREEN_UPDATE_IND16( rltennis ); + diff --git a/src/mame/includes/rockrage.h b/src/mame/includes/rockrage.h index 6e83ff6a021..4a3c1da3542 100644 --- a/src/mame/includes/rockrage.h +++ b/src/mame/includes/rockrage.h @@ -30,13 +30,14 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void palette_init(); + UINT32 screen_update_rockrage(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/rockrage.c -----------*/ -SCREEN_UPDATE_IND16( rockrage ); + void rockrage_tile_callback(running_machine &machine, int layer, int bank, int *code, int *color, int *flags); diff --git a/src/mame/includes/rocnrope.h b/src/mame/includes/rocnrope.h index ffa304d6e5e..50914fd84cc 100644 --- a/src/mame/includes/rocnrope.h +++ b/src/mame/includes/rocnrope.h @@ -28,6 +28,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_rocnrope(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/rocnrope.c -----------*/ @@ -35,4 +36,4 @@ public: -SCREEN_UPDATE_IND16( rocnrope ); + diff --git a/src/mame/includes/rohga.h b/src/mame/includes/rohga.h index 4c19e285132..0e90016feb5 100644 --- a/src/mame/includes/rohga.h +++ b/src/mame/includes/rohga.h @@ -57,6 +57,9 @@ public: DECLARE_VIDEO_START(rohga); DECLARE_VIDEO_START(wizdfire); DECLARE_VIDEO_START(schmeisr); + UINT32 screen_update_rohga(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_wizdfire(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_nitrobal(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -69,9 +72,9 @@ public: -SCREEN_UPDATE_IND16( rohga ); -SCREEN_UPDATE_RGB32( wizdfire ); -SCREEN_UPDATE_RGB32( nitrobal ); + + + UINT16 rohga_pri_callback(UINT16 x); UINT16 schmeisr_col_callback(UINT16 x); diff --git a/src/mame/includes/rollerg.h b/src/mame/includes/rollerg.h index 382f13e184b..a62b5dd23ea 100644 --- a/src/mame/includes/rollerg.h +++ b/src/mame/includes/rollerg.h @@ -36,6 +36,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_rollerg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/rollerg.c -----------*/ @@ -44,4 +45,4 @@ extern void rollerg_sprite_callback(running_machine &machine, int *code,int *col extern void rollerg_zoom_callback(running_machine &machine, int *code,int *color,int *flags); -SCREEN_UPDATE_IND16( rollerg ); + diff --git a/src/mame/includes/rollrace.h b/src/mame/includes/rollrace.h index c147800b7cd..74e802b5350 100644 --- a/src/mame/includes/rollrace.h +++ b/src/mame/includes/rollrace.h @@ -34,12 +34,13 @@ public: DECLARE_WRITE8_MEMBER(rollrace_flipy_w); DECLARE_WRITE8_MEMBER(rollrace_flipx_w); virtual void palette_init(); + UINT32 screen_update_rollrace(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/rollrace.c -----------*/ -SCREEN_UPDATE_IND16( rollrace ); + diff --git a/src/mame/includes/route16.h b/src/mame/includes/route16.h index 9824699a95c..6213da4a4a6 100644 --- a/src/mame/includes/route16.h +++ b/src/mame/includes/route16.h @@ -28,11 +28,14 @@ public: DECLARE_WRITE8_MEMBER(stratvox_sn76477_w); DECLARE_DRIVER_INIT(route16); DECLARE_DRIVER_INIT(route16a); + UINT32 screen_update_route16(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_stratvox(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_ttmahjng(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/route16.c -----------*/ -SCREEN_UPDATE_RGB32( route16 ); -SCREEN_UPDATE_RGB32( stratvox ); -SCREEN_UPDATE_RGB32( ttmahjng ); + + + diff --git a/src/mame/includes/rpunch.h b/src/mame/includes/rpunch.h index 45ffa2f584d..4443506829c 100644 --- a/src/mame/includes/rpunch.h +++ b/src/mame/includes/rpunch.h @@ -39,11 +39,12 @@ public: TILE_GET_INFO_MEMBER(get_bg1_tile_info); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_rpunch(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/rpunch.c -----------*/ -SCREEN_UPDATE_IND16( rpunch ); + diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h index a44d0584bfb..61d3a96a779 100644 --- a/src/mame/includes/runaway.h +++ b/src/mame/includes/runaway.h @@ -24,6 +24,8 @@ public: virtual void machine_reset(); virtual void video_start(); DECLARE_VIDEO_START(qwak); + UINT32 screen_update_runaway(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_qwak(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -31,6 +33,6 @@ public: -SCREEN_UPDATE_IND16( runaway ); -SCREEN_UPDATE_IND16( qwak ); + + diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h index d1801db80bc..c6b15d809bf 100644 --- a/src/mame/includes/rungun.h +++ b/src/mame/includes/rungun.h @@ -52,6 +52,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_rng(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -63,4 +64,4 @@ extern void rng_sprite_callback(running_machine &machine, int *code, int *color, -SCREEN_UPDATE_IND16( rng ); + diff --git a/src/mame/includes/sauro.h b/src/mame/includes/sauro.h index dd5fe188ea9..c837cdad44e 100644 --- a/src/mame/includes/sauro.h +++ b/src/mame/includes/sauro.h @@ -36,6 +36,8 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_fg); DECLARE_VIDEO_START(trckydoc); DECLARE_VIDEO_START(sauro); + UINT32 screen_update_trckydoc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_sauro(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -45,5 +47,5 @@ public: -SCREEN_UPDATE_IND16( sauro ); -SCREEN_UPDATE_IND16( trckydoc ); + + diff --git a/src/mame/includes/sbasketb.h b/src/mame/includes/sbasketb.h index a0d6b169266..405ea321a27 100644 --- a/src/mame/includes/sbasketb.h +++ b/src/mame/includes/sbasketb.h @@ -42,6 +42,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_sbasketb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/sbasketb.c -----------*/ @@ -49,4 +50,4 @@ public: -SCREEN_UPDATE_IND16( sbasketb ); + diff --git a/src/mame/includes/sbugger.h b/src/mame/includes/sbugger.h index 8066761ba4f..89f8042b4fa 100644 --- a/src/mame/includes/sbugger.h +++ b/src/mame/includes/sbugger.h @@ -16,11 +16,12 @@ public: TILE_GET_INFO_MEMBER(get_sbugger_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_sbugger(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/sbugger.c -----------*/ -SCREEN_UPDATE_IND16(sbugger); + diff --git a/src/mame/includes/scotrsht.h b/src/mame/includes/scotrsht.h index f816464f68f..ebae27fcb96 100644 --- a/src/mame/includes/scotrsht.h +++ b/src/mame/includes/scotrsht.h @@ -25,6 +25,7 @@ public: TILE_GET_INFO_MEMBER(scotrsht_get_bg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_scotrsht(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -33,4 +34,4 @@ public: -SCREEN_UPDATE_IND16( scotrsht ); + diff --git a/src/mame/includes/sderby.h b/src/mame/includes/sderby.h index 8c7e08139ee..bd4ad675caa 100644 --- a/src/mame/includes/sderby.h +++ b/src/mame/includes/sderby.h @@ -33,11 +33,13 @@ public: TILE_GET_INFO_MEMBER(get_sderby_md_tile_info); TILE_GET_INFO_MEMBER(get_sderby_fg_tile_info); virtual void video_start(); + UINT32 screen_update_sderby(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_pmroulet(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/sderby.c -----------*/ -SCREEN_UPDATE_IND16( sderby ); -SCREEN_UPDATE_IND16( pmroulet ); + + diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h index b5aa11eb586..6b73ac2cf9c 100644 --- a/src/mame/includes/segag80r.h +++ b/src/mame/includes/segag80r.h @@ -98,6 +98,7 @@ public: TILE_GET_INFO_MEMBER(bg_get_tile_info); virtual void machine_start(); virtual void video_start(); + UINT32 screen_update_segag80r(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -125,7 +126,7 @@ INTERRUPT_GEN( segag80r_vblank_start ); -SCREEN_UPDATE_IND16( segag80r ); + diff --git a/src/mame/includes/segag80v.h b/src/mame/includes/segag80v.h index 10a76f5dd98..6736ff101c9 100644 --- a/src/mame/includes/segag80v.h +++ b/src/mame/includes/segag80v.h @@ -52,6 +52,7 @@ public: DECLARE_DRIVER_INIT(spacfury); virtual void machine_start(); virtual void video_start(); + UINT32 screen_update_segag80v(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -62,4 +63,4 @@ public: /*----------- defined in video/segag80v.c -----------*/ -SCREEN_UPDATE_RGB32( segag80v ); + diff --git a/src/mame/includes/segas24.h b/src/mame/includes/segas24.h index 1d6658da177..745074cac22 100644 --- a/src/mame/includes/segas24.h +++ b/src/mame/includes/segas24.h @@ -112,8 +112,9 @@ public: DECLARE_DRIVER_INIT(sgmast); virtual void machine_start(); virtual void machine_reset(); + UINT32 screen_update_system24(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/segas24.c -----------*/ -SCREEN_UPDATE_IND16(system24); + diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h index 020a9e9d358..b05375ba1ea 100644 --- a/src/mame/includes/segas32.h +++ b/src/mame/includes/segas32.h @@ -174,6 +174,9 @@ public: DECLARE_MACHINE_RESET(system32); DECLARE_VIDEO_START(system32); DECLARE_VIDEO_START(multi32); + UINT32 screen_update_system32(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_multi32_left(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_multi32_right(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -195,9 +198,9 @@ void decrypt_ga2_protrom(running_machine &machine); -SCREEN_UPDATE_RGB32(system32); -SCREEN_UPDATE_RGB32(multi32_left); -SCREEN_UPDATE_RGB32(multi32_right); + + + void system32_set_vblank(running_machine &machine, int state); diff --git a/src/mame/includes/seibuspi.h b/src/mame/includes/seibuspi.h index fd0fea2ecd7..b2d9e3c066e 100644 --- a/src/mame/includes/seibuspi.h +++ b/src/mame/includes/seibuspi.h @@ -113,6 +113,8 @@ public: DECLARE_VIDEO_START(sys386f2); DECLARE_MACHINE_START(sxx2f); DECLARE_MACHINE_RESET(sxx2f); + UINT32 screen_update_spi(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_sys386f2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -124,10 +126,10 @@ void seibuspi_sprite_decrypt(UINT8 *src, int romsize); /*----------- defined in video/seibuspi.c -----------*/ -SCREEN_UPDATE_RGB32( spi ); -SCREEN_UPDATE_RGB32( sys386f2 ); + + void rf2_set_layer_banks(running_machine &machine, int banks); diff --git a/src/mame/includes/seicross.h b/src/mame/includes/seicross.h index 2b7e7f592c1..56254f0a57a 100644 --- a/src/mame/includes/seicross.h +++ b/src/mame/includes/seicross.h @@ -29,6 +29,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_seicross(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -37,4 +38,4 @@ public: -SCREEN_UPDATE_IND16( seicross ); + diff --git a/src/mame/includes/senjyo.h b/src/mame/includes/senjyo.h index c80d1ac1a4c..0e2516ea779 100644 --- a/src/mame/includes/senjyo.h +++ b/src/mame/includes/senjyo.h @@ -81,6 +81,7 @@ public: TILE_GET_INFO_MEMBER(get_bg3_tile_info); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_senjyo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -95,4 +96,4 @@ extern const z80ctc_interface senjyo_ctc_intf; -SCREEN_UPDATE_IND16( senjyo ); + diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h index 58653ec938b..2c1389c96d2 100644 --- a/src/mame/includes/seta.h +++ b/src/mame/includes/seta.h @@ -190,6 +190,14 @@ public: DECLARE_MACHINE_START(keroppi); DECLARE_VIDEO_START(oisipuzl_2_layers); DECLARE_PALETTE_INIT(inttoote); + UINT32 screen_update_seta_no_layers(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_seta(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_usclssic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_setaroul(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_inttoote(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_seta_layers(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_seta_buffer_sprites(screen_device &screen, bool state); + void screen_eof_setaroul(screen_device &screen, bool state); }; /*----------- defined in video/seta.c -----------*/ @@ -212,11 +220,11 @@ void seta_coin_lockout_w(running_machine &machine, int data); -SCREEN_UPDATE_IND16( seta ); -SCREEN_UPDATE_IND16( seta_no_layers ); -SCREEN_UPDATE_IND16( usclssic ); -SCREEN_UPDATE_IND16( inttoote ); -SCREEN_UPDATE_IND16( setaroul ); -SCREEN_VBLANK( setaroul ); + + + + + + diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h index 63ee6af7e4d..706fd581efb 100644 --- a/src/mame/includes/seta2.h +++ b/src/mame/includes/seta2.h @@ -69,6 +69,8 @@ public: DECLARE_MACHINE_RESET(funcube); DECLARE_VIDEO_START(seta2_yoffset); DECLARE_VIDEO_START(seta2_xoffset); + UINT32 screen_update_seta2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_seta2(screen_device &screen, bool state); }; /*----------- defined in video/seta2.c -----------*/ @@ -77,5 +79,5 @@ public: -SCREEN_UPDATE_IND16( seta2 ); -SCREEN_VBLANK( seta2 ); + + diff --git a/src/mame/includes/sf.h b/src/mame/includes/sf.h index a7b2e55facc..a5438caee28 100644 --- a/src/mame/includes/sf.h +++ b/src/mame/includes/sf.h @@ -47,6 +47,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_sf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -54,4 +55,4 @@ public: -SCREEN_UPDATE_IND16( sf ); + diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h index 72f27a56e95..2bb700ad157 100644 --- a/src/mame/includes/shadfrce.h +++ b/src/mame/includes/shadfrce.h @@ -42,11 +42,13 @@ public: TILE_GET_INFO_MEMBER(get_shadfrce_bg0tile_info); TILE_GET_INFO_MEMBER(get_shadfrce_bg1tile_info); virtual void video_start(); + UINT32 screen_update_shadfrce(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_shadfrce(screen_device &screen, bool state); }; /*----------- defined in video/shadfrce.c -----------*/ -SCREEN_VBLANK(shadfrce); -SCREEN_UPDATE_IND16( shadfrce ); + + diff --git a/src/mame/includes/shangha3.h b/src/mame/includes/shangha3.h index e7f2f694fa4..ff257fb0eae 100644 --- a/src/mame/includes/shangha3.h +++ b/src/mame/includes/shangha3.h @@ -27,10 +27,11 @@ public: DECLARE_DRIVER_INIT(shangha3); DECLARE_DRIVER_INIT(heberpop); virtual void video_start(); + UINT32 screen_update_shangha3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/shangha3.c -----------*/ -SCREEN_UPDATE_IND16( shangha3 ); + diff --git a/src/mame/includes/shangkid.h b/src/mame/includes/shangkid.h index 08423bb136e..66d2301cec2 100644 --- a/src/mame/includes/shangkid.h +++ b/src/mame/includes/shangkid.h @@ -30,14 +30,16 @@ public: DECLARE_VIDEO_START(shangkid); DECLARE_PALETTE_INIT(dynamski); DECLARE_MACHINE_RESET(shangkid); + UINT32 screen_update_shangkid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_dynamski(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/shangkid.c -----------*/ -SCREEN_UPDATE_IND16( shangkid ); -SCREEN_UPDATE_IND16( dynamski ); + + diff --git a/src/mame/includes/shaolins.h b/src/mame/includes/shaolins.h index 312604bbd2b..682b7ccfe5e 100644 --- a/src/mame/includes/shaolins.h +++ b/src/mame/includes/shaolins.h @@ -25,6 +25,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_shaolins(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -33,4 +34,4 @@ public: -SCREEN_UPDATE_IND16( shaolins ); + diff --git a/src/mame/includes/shisen.h b/src/mame/includes/shisen.h index e6cc91bf381..f1b166d90f6 100644 --- a/src/mame/includes/shisen.h +++ b/src/mame/includes/shisen.h @@ -17,6 +17,7 @@ public: DECLARE_WRITE8_MEMBER(sichuan2_paletteram_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); + UINT32 screen_update_sichuan2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -24,4 +25,4 @@ public: -SCREEN_UPDATE_IND16( sichuan2 ); + diff --git a/src/mame/includes/shootout.h b/src/mame/includes/shootout.h index 2ff285ee8af..dd7be1d97ce 100644 --- a/src/mame/includes/shootout.h +++ b/src/mame/includes/shootout.h @@ -26,6 +26,8 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_shootout(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_shootouj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -34,5 +36,5 @@ public: -SCREEN_UPDATE_IND16( shootout ); -SCREEN_UPDATE_IND16( shootouj ); + + diff --git a/src/mame/includes/shuuz.h b/src/mame/includes/shuuz.h index ad2fc6ce04f..545ca7b49da 100644 --- a/src/mame/includes/shuuz.h +++ b/src/mame/includes/shuuz.h @@ -22,10 +22,11 @@ public: DECLARE_MACHINE_START(shuuz); DECLARE_MACHINE_RESET(shuuz); DECLARE_VIDEO_START(shuuz); + UINT32 screen_update_shuuz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/shuuz.c -----------*/ -SCREEN_UPDATE_IND16( shuuz ); + diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h index 07a1cdb7b39..c5d7a895576 100644 --- a/src/mame/includes/sidearms.h +++ b/src/mame/includes/sidearms.h @@ -51,10 +51,11 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); TILEMAP_MAPPER_MEMBER(sidearms_tilemap_scan); virtual void video_start(); + UINT32 screen_update_sidearms(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/sidearms.c -----------*/ -SCREEN_UPDATE_IND16( sidearms ); + diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h index ba9898417da..094c5102ce2 100644 --- a/src/mame/includes/sidepckt.h +++ b/src/mame/includes/sidepckt.h @@ -28,6 +28,7 @@ public: TILE_GET_INFO_MEMBER(get_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_sidepckt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -35,5 +36,5 @@ public: -SCREEN_UPDATE_IND16( sidepckt ); + diff --git a/src/mame/includes/silkroad.h b/src/mame/includes/silkroad.h index 62abdc06594..64354376c65 100644 --- a/src/mame/includes/silkroad.h +++ b/src/mame/includes/silkroad.h @@ -28,10 +28,11 @@ public: TILE_GET_INFO_MEMBER(get_fg2_tile_info); TILE_GET_INFO_MEMBER(get_fg3_tile_info); virtual void video_start(); + UINT32 screen_update_silkroad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/silkroad.c -----------*/ -SCREEN_UPDATE_IND16(silkroad); + diff --git a/src/mame/includes/simpl156.h b/src/mame/includes/simpl156.h index fa48b16170f..a1379662440 100644 --- a/src/mame/includes/simpl156.h +++ b/src/mame/includes/simpl156.h @@ -58,6 +58,7 @@ public: DECLARE_DRIVER_INIT(osman); DECLARE_DRIVER_INIT(chainrec); virtual void video_start(); + UINT32 screen_update_simpl156(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -65,4 +66,4 @@ public: /*----------- defined in video/simpl156.c -----------*/ -SCREEN_UPDATE_IND16( simpl156 ); + diff --git a/src/mame/includes/simpsons.h b/src/mame/includes/simpsons.h index c0266d25576..191f4fd446b 100644 --- a/src/mame/includes/simpsons.h +++ b/src/mame/includes/simpsons.h @@ -39,6 +39,7 @@ public: DECLARE_WRITE8_MEMBER(simpsons_k053247_w); virtual void machine_start(); virtual void machine_reset(); + UINT32 screen_update_simpsons(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in machine/simpsons.c -----------*/ @@ -50,7 +51,7 @@ DECLARE_READ8_DEVICE_HANDLER( simpsons_sound_r ); /*----------- defined in video/simpsons.c -----------*/ void simpsons_video_banking( running_machine &machine, int select ); -SCREEN_UPDATE_IND16( simpsons ); + extern void simpsons_tile_callback(running_machine &machine, int layer,int bank,int *code,int *color,int *flags,int *priority); extern void simpsons_sprite_callback(running_machine &machine, int *code,int *color,int *priority_mask); diff --git a/src/mame/includes/skullxbo.h b/src/mame/includes/skullxbo.h index 46e6451d23f..b9fdb2d7ff1 100644 --- a/src/mame/includes/skullxbo.h +++ b/src/mame/includes/skullxbo.h @@ -20,6 +20,7 @@ public: DECLARE_MACHINE_START(skullxbo); DECLARE_MACHINE_RESET(skullxbo); DECLARE_VIDEO_START(skullxbo); + UINT32 screen_update_skullxbo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -31,6 +32,6 @@ DECLARE_WRITE16_HANDLER( skullxbo_yscroll_w ); DECLARE_WRITE16_HANDLER( skullxbo_mobmsb_w ); -SCREEN_UPDATE_IND16( skullxbo ); + void skullxbo_scanline_update(running_machine &machine, int param); diff --git a/src/mame/includes/skydiver.h b/src/mame/includes/skydiver.h index 81f486d91ae..99750941ec9 100644 --- a/src/mame/includes/skydiver.h +++ b/src/mame/includes/skydiver.h @@ -50,6 +50,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_skydiver(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -62,4 +63,4 @@ DISCRETE_SOUND_EXTERN( skydiver ); -SCREEN_UPDATE_IND16( skydiver ); + diff --git a/src/mame/includes/skyfox.h b/src/mame/includes/skyfox.h index 67db54511bb..8e317baff31 100644 --- a/src/mame/includes/skyfox.h +++ b/src/mame/includes/skyfox.h @@ -31,6 +31,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void palette_init(); + UINT32 screen_update_skyfox(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/skyfox.c -----------*/ @@ -38,5 +39,5 @@ public: -SCREEN_UPDATE_IND16( skyfox ); + diff --git a/src/mame/includes/skykid.h b/src/mame/includes/skykid.h index 06c4fd74bf5..31f3bc123e2 100644 --- a/src/mame/includes/skykid.h +++ b/src/mame/includes/skykid.h @@ -40,12 +40,13 @@ public: virtual void machine_start(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_skykid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/skykid.c -----------*/ -SCREEN_UPDATE_IND16( skykid ); + diff --git a/src/mame/includes/skyraid.h b/src/mame/includes/skyraid.h index f703b84d93d..a4383646bf3 100644 --- a/src/mame/includes/skyraid.h +++ b/src/mame/includes/skyraid.h @@ -25,6 +25,7 @@ public: DECLARE_WRITE8_MEMBER(skyraid_scroll_w); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_skyraid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -38,4 +39,4 @@ DECLARE_WRITE8_DEVICE_HANDLER( skyraid_sound_w ); /*----------- defined in video/skyraid.c -----------*/ -SCREEN_UPDATE_IND16(skyraid); + diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h index 26f9ba3e920..4d57c31ab71 100644 --- a/src/mame/includes/slapfght.h +++ b/src/mame/includes/slapfght.h @@ -123,6 +123,8 @@ public: DECLARE_MACHINE_RESET(slapfight); DECLARE_VIDEO_START(perfrman); DECLARE_VIDEO_START(slapfight); + UINT32 screen_update_perfrman(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_slapfight(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -156,8 +158,8 @@ INTERRUPT_GEN( getstar_interrupt ); /*----------- defined in video/slapfght.c -----------*/ -SCREEN_UPDATE_IND16( slapfight ); -SCREEN_UPDATE_IND16( perfrman ); + + diff --git a/src/mame/includes/slapshot.h b/src/mame/includes/slapshot.h index 91354dd4517..7b191c8e9a0 100644 --- a/src/mame/includes/slapshot.h +++ b/src/mame/includes/slapshot.h @@ -64,11 +64,13 @@ public: DECLARE_DRIVER_INIT(slapshot); virtual void machine_start(); virtual void video_start(); + UINT32 screen_update_slapshot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_taito_no_buffer(screen_device &screen, bool state); }; /*----------- defined in video/slapshot.c -----------*/ -SCREEN_UPDATE_IND16( slapshot ); -SCREEN_VBLANK( taito_no_buffer ); + + diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h index 3cac9e7c625..914df3f98dd 100644 --- a/src/mame/includes/snk.h +++ b/src/mame/includes/snk.h @@ -164,6 +164,11 @@ public: DECLARE_VIDEO_START(psychos); DECLARE_VIDEO_START(snk_3bpp_shadow); DECLARE_VIDEO_START(snk_4bpp_shadow); + UINT32 screen_update_marvins(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_tnk3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_ikari(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_gwar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_tdfever(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/snk6502.h b/src/mame/includes/snk6502.h index 1177c64f1e8..e3588fca731 100644 --- a/src/mame/includes/snk6502.h +++ b/src/mame/includes/snk6502.h @@ -60,6 +60,7 @@ public: DECLARE_MACHINE_RESET(satansat); DECLARE_MACHINE_RESET(pballoon); DECLARE_VIDEO_START(pballoon); + UINT32 screen_update_snk6502(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -119,7 +120,7 @@ DISCRETE_SOUND_EXTERN( fantasy ); -SCREEN_UPDATE_IND16( snk6502 ); + diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h index 58d10ce8172..5048e52b720 100644 --- a/src/mame/includes/snk68.h +++ b/src/mame/includes/snk68.h @@ -43,6 +43,7 @@ public: TILE_GET_INFO_MEMBER(get_searchar_tile_info); virtual void video_start(); DECLARE_VIDEO_START(searchar); + UINT32 screen_update_pow(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -50,4 +51,4 @@ public: -SCREEN_UPDATE_IND16( pow ); + diff --git a/src/mame/includes/snookr10.h b/src/mame/includes/snookr10.h index 83d3611bb26..c315352a3bd 100644 --- a/src/mame/includes/snookr10.h +++ b/src/mame/includes/snookr10.h @@ -28,6 +28,7 @@ public: virtual void palette_init(); DECLARE_VIDEO_START(apple10); DECLARE_PALETTE_INIT(apple10); + UINT32 screen_update_snookr10(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -37,5 +38,5 @@ public: -SCREEN_UPDATE_IND16( snookr10 ); + diff --git a/src/mame/includes/snowbros.h b/src/mame/includes/snowbros.h index 25faa52daa5..af2309b0a73 100644 --- a/src/mame/includes/snowbros.h +++ b/src/mame/includes/snowbros.h @@ -43,5 +43,11 @@ public: DECLARE_DRIVER_INIT(cookbib2); DECLARE_MACHINE_RESET(semiprot); DECLARE_MACHINE_RESET(finalttr); + UINT32 screen_update_snowbros(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_honeydol(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_twinadv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_snowbro3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_wintbob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_snowbros(screen_device &screen, bool state); }; diff --git a/src/mame/includes/solomon.h b/src/mame/includes/solomon.h index 0f35ec04171..ac9cd8809c4 100644 --- a/src/mame/includes/solomon.h +++ b/src/mame/includes/solomon.h @@ -30,6 +30,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); virtual void video_start(); + UINT32 screen_update_solomon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -37,4 +38,4 @@ public: -SCREEN_UPDATE_IND16( solomon ); + diff --git a/src/mame/includes/sonson.h b/src/mame/includes/sonson.h index d28fd47f40c..549f3c6fd93 100644 --- a/src/mame/includes/sonson.h +++ b/src/mame/includes/sonson.h @@ -38,6 +38,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_sonson(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -46,4 +47,4 @@ public: -SCREEN_UPDATE_IND16( sonson ); + diff --git a/src/mame/includes/spacefb.h b/src/mame/includes/spacefb.h index 5875a4d36a6..fce6be15607 100644 --- a/src/mame/includes/spacefb.h +++ b/src/mame/includes/spacefb.h @@ -49,6 +49,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_spacefb(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -61,5 +62,5 @@ MACHINE_CONFIG_EXTERN( spacefb_audio ); /*----------- defined in video/spacefb.c -----------*/ -SCREEN_UPDATE_RGB32( spacefb ); + diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h index a9eb91e9044..f8d254f3202 100644 --- a/src/mame/includes/spbactn.h +++ b/src/mame/includes/spbactn.h @@ -15,10 +15,11 @@ public: bitmap_ind16 m_tile_bitmap_fg; DECLARE_WRITE16_MEMBER(soundcommand_w); virtual void video_start(); + UINT32 screen_update_spbactn(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/spbactn.c -----------*/ -SCREEN_UPDATE_RGB32( spbactn ); + diff --git a/src/mame/includes/spcforce.h b/src/mame/includes/spcforce.h index 4255860cdfc..5b6726e98ad 100644 --- a/src/mame/includes/spcforce.h +++ b/src/mame/includes/spcforce.h @@ -33,9 +33,10 @@ public: DECLARE_WRITE8_MEMBER(irq_mask_w); DECLARE_WRITE8_MEMBER(spcforce_flip_screen_w); virtual void palette_init(); + UINT32 screen_update_spcforce(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/spcforce.c -----------*/ -SCREEN_UPDATE_IND16( spcforce ); + diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h index a64fab0fbd5..edaa6dddef5 100644 --- a/src/mame/includes/spdodgeb.h +++ b/src/mame/includes/spdodgeb.h @@ -46,6 +46,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_spdodgeb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -53,5 +54,5 @@ public: -SCREEN_UPDATE_IND16( spdodgeb ); + TIMER_DEVICE_CALLBACK( spdodgeb_interrupt ); diff --git a/src/mame/includes/speedatk.h b/src/mame/includes/speedatk.h index a7ca9a90fb1..427d2aae98a 100644 --- a/src/mame/includes/speedatk.h +++ b/src/mame/includes/speedatk.h @@ -26,6 +26,7 @@ public: DECLARE_WRITE8_MEMBER(speedatk_output_w); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_speedatk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -33,4 +34,4 @@ public: -SCREEN_UPDATE_IND16( speedatk ); + diff --git a/src/mame/includes/speedbal.h b/src/mame/includes/speedbal.h index c1bc7b38fff..47e4b816b64 100644 --- a/src/mame/includes/speedbal.h +++ b/src/mame/includes/speedbal.h @@ -18,10 +18,11 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_bg); TILE_GET_INFO_MEMBER(get_tile_info_fg); virtual void video_start(); + UINT32 screen_update_speedbal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/speedbal.c -----------*/ -SCREEN_UPDATE_IND16( speedbal ); + diff --git a/src/mame/includes/speedspn.h b/src/mame/includes/speedspn.h index a06293c51d4..71407465a1e 100644 --- a/src/mame/includes/speedspn.h +++ b/src/mame/includes/speedspn.h @@ -21,12 +21,13 @@ public: DECLARE_WRITE8_MEMBER(oki_banking_w); TILE_GET_INFO_MEMBER(get_speedspn_tile_info); virtual void video_start(); + UINT32 screen_update_speedspn(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/speedspn.c -----------*/ -SCREEN_UPDATE_IND16( speedspn ); + diff --git a/src/mame/includes/splash.h b/src/mame/includes/splash.h index 0a44e3dcd46..950c048b072 100644 --- a/src/mame/includes/splash.h +++ b/src/mame/includes/splash.h @@ -62,11 +62,13 @@ public: virtual void video_start(); DECLARE_MACHINE_RESET(splash); DECLARE_MACHINE_RESET(funystrp); + UINT32 screen_update_splash(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_funystrp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/splash.c -----------*/ -SCREEN_UPDATE_IND16( splash ); -SCREEN_UPDATE_IND16( funystrp ); + + diff --git a/src/mame/includes/sprcros2.h b/src/mame/includes/sprcros2.h index 7a3ca78c867..1b4f13f536e 100644 --- a/src/mame/includes/sprcros2.h +++ b/src/mame/includes/sprcros2.h @@ -30,6 +30,7 @@ public: virtual void machine_start(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_sprcros2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -38,4 +39,4 @@ public: -SCREEN_UPDATE_IND16( sprcros2 ); + diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h index 3d6f0ab5b8c..5ac855594c9 100644 --- a/src/mame/includes/sprint2.h +++ b/src/mame/includes/sprint2.h @@ -64,6 +64,8 @@ public: TILE_GET_INFO_MEMBER(get_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_sprint2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_sprint2(screen_device &screen, bool state); }; @@ -79,7 +81,7 @@ DISCRETE_SOUND_EXTERN( dominos ); -SCREEN_UPDATE_IND16( sprint2 ); -SCREEN_VBLANK( sprint2 ); + + diff --git a/src/mame/includes/sprint4.h b/src/mame/includes/sprint4.h index 866602eda5a..03da19701ee 100644 --- a/src/mame/includes/sprint4.h +++ b/src/mame/includes/sprint4.h @@ -38,6 +38,8 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_sprint4(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_sprint4(screen_device &screen, bool state); }; @@ -45,7 +47,7 @@ public: -SCREEN_VBLANK( sprint4 ); -SCREEN_UPDATE_IND16( sprint4 ); + + diff --git a/src/mame/includes/sprint8.h b/src/mame/includes/sprint8.h index 0f2f3902b62..d7c132cc501 100644 --- a/src/mame/includes/sprint8.h +++ b/src/mame/includes/sprint8.h @@ -35,6 +35,8 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_sprint8(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_sprint8(screen_device &screen, bool state); }; @@ -46,9 +48,9 @@ void sprint8_set_collision(running_machine &machine, int n); /*----------- defined in video/sprint8.c -----------*/ -SCREEN_VBLANK( sprint8 ); -SCREEN_UPDATE_IND16( sprint8 ); + + diff --git a/src/mame/includes/spy.h b/src/mame/includes/spy.h index 4fe5469b7ae..77b1bb5edb8 100644 --- a/src/mame/includes/spy.h +++ b/src/mame/includes/spy.h @@ -44,6 +44,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_spy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -53,4 +54,4 @@ extern void spy_tile_callback(running_machine &machine, int layer,int bank,int * extern void spy_sprite_callback(running_machine &machine, int *code,int *color,int *priority_mask,int *shadow); -SCREEN_UPDATE_IND16( spy ); + diff --git a/src/mame/includes/srmp2.h b/src/mame/includes/srmp2.h index 765ffff91df..cbe1c204d35 100644 --- a/src/mame/includes/srmp2.h +++ b/src/mame/includes/srmp2.h @@ -46,13 +46,16 @@ public: DECLARE_MACHINE_START(srmp3); DECLARE_PALETTE_INIT(srmp3); DECLARE_MACHINE_START(rmgoldyh); + UINT32 screen_update_srmp2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_srmp3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_mjyuugi(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/srmp2.c -----------*/ -SCREEN_UPDATE_IND16( srmp2 ); -SCREEN_UPDATE_IND16( srmp3 ); -SCREEN_UPDATE_IND16( mjyuugi ); + + + diff --git a/src/mame/includes/srumbler.h b/src/mame/includes/srumbler.h index a0d576ea114..73e5232324d 100644 --- a/src/mame/includes/srumbler.h +++ b/src/mame/includes/srumbler.h @@ -27,6 +27,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void machine_start(); virtual void video_start(); + UINT32 screen_update_srumbler(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -34,5 +35,5 @@ public: -SCREEN_UPDATE_IND16( srumbler ); -SCREEN_VBLANK( srumbler ); + + diff --git a/src/mame/includes/sshangha.h b/src/mame/includes/sshangha.h index 50108875a50..6530c476d49 100644 --- a/src/mame/includes/sshangha.h +++ b/src/mame/includes/sshangha.h @@ -49,11 +49,12 @@ public: DECLARE_DRIVER_INIT(sshangha); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_sshangha(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/sshangha.c -----------*/ -SCREEN_UPDATE_RGB32( sshangha ); + diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h index 55701cfe5ee..79ca024a60c 100644 --- a/src/mame/includes/sslam.h +++ b/src/mame/includes/sslam.h @@ -50,6 +50,8 @@ public: TILE_GET_INFO_MEMBER(get_powerbls_bg_tile_info); DECLARE_VIDEO_START(sslam); DECLARE_VIDEO_START(powerbls); + UINT32 screen_update_sslam(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_powerbls(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -57,5 +59,5 @@ public: -SCREEN_UPDATE_IND16(sslam); -SCREEN_UPDATE_IND16(powerbls); + + diff --git a/src/mame/includes/ssozumo.h b/src/mame/includes/ssozumo.h index c57e826b526..1709716dedd 100644 --- a/src/mame/includes/ssozumo.h +++ b/src/mame/includes/ssozumo.h @@ -35,6 +35,7 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_ssozumo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -43,4 +44,4 @@ public: -SCREEN_UPDATE_IND16( ssozumo ); + diff --git a/src/mame/includes/sspeedr.h b/src/mame/includes/sspeedr.h index 4d4fc25b721..61347824700 100644 --- a/src/mame/includes/sspeedr.h +++ b/src/mame/includes/sspeedr.h @@ -35,6 +35,8 @@ public: DECLARE_WRITE8_MEMBER(sspeedr_track_ice_w); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_sspeedr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_sspeedr(screen_device &screen, bool state); }; @@ -44,5 +46,5 @@ public: -SCREEN_UPDATE_IND16( sspeedr ); -SCREEN_VBLANK( sspeedr ); + + diff --git a/src/mame/includes/ssrj.h b/src/mame/includes/ssrj.h index bd6168f3884..7123ba93adf 100644 --- a/src/mame/includes/ssrj.h +++ b/src/mame/includes/ssrj.h @@ -29,6 +29,8 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_ssrj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_ssrj(screen_device &screen, bool state); }; @@ -36,6 +38,6 @@ public: -SCREEN_UPDATE_IND16( ssrj ); -SCREEN_VBLANK( ssrj ); + + diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h index fa68efa6a0a..0baa2ac45b2 100644 --- a/src/mame/includes/ssv.h +++ b/src/mame/includes/ssv.h @@ -125,6 +125,9 @@ public: virtual void video_start(); DECLARE_VIDEO_START(gdfs); DECLARE_VIDEO_START(eaglshot); + UINT32 screen_update_ssv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_gdfs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_eaglshot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/ssv.c -----------*/ @@ -135,6 +138,6 @@ void ssv_enable_video(running_machine &machine, int enable); -SCREEN_UPDATE_IND16( ssv ); -SCREEN_UPDATE_IND16( eaglshot ); -SCREEN_UPDATE_IND16( gdfs ); + + + diff --git a/src/mame/includes/st0016.h b/src/mame/includes/st0016.h index a20fa4e348f..df9f3c015f3 100644 --- a/src/mame/includes/st0016.h +++ b/src/mame/includes/st0016.h @@ -37,6 +37,8 @@ public: DECLARE_DRIVER_INIT(mayjisn2); DECLARE_DRIVER_INIT(renju); DECLARE_VIDEO_START(st0016); + void st0016_draw_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_st0016(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; #define ISMACS (st0016_game&0x80) @@ -69,6 +71,3 @@ extern UINT32 st0016_game; extern UINT8 *st0016_charram; -void st0016_draw_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - -SCREEN_UPDATE_IND16(st0016); diff --git a/src/mame/includes/stactics.h b/src/mame/includes/stactics.h index b6c9b23bd80..cdef8aefdd0 100644 --- a/src/mame/includes/stactics.h +++ b/src/mame/includes/stactics.h @@ -59,6 +59,7 @@ public: virtual void machine_start(); DECLARE_VIDEO_START(stactics); DECLARE_PALETTE_INIT(stactics); + UINT32 screen_update_stactics(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/stadhero.h b/src/mame/includes/stadhero.h index 43453b0db71..8915601c8d6 100644 --- a/src/mame/includes/stadhero.h +++ b/src/mame/includes/stadhero.h @@ -15,11 +15,12 @@ public: DECLARE_WRITE16_MEMBER(stadhero_pf1_data_w); TILE_GET_INFO_MEMBER(get_pf1_tile_info); virtual void video_start(); + UINT32 screen_update_stadhero(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/stadhero.c -----------*/ -SCREEN_UPDATE_IND16( stadhero ); + diff --git a/src/mame/includes/starcrus.h b/src/mame/includes/starcrus.h index a0fb8bda970..a531b0ec71b 100644 --- a/src/mame/includes/starcrus.h +++ b/src/mame/includes/starcrus.h @@ -50,10 +50,11 @@ public: DECLARE_WRITE8_MEMBER(starcrus_proj_parm_2_w); DECLARE_READ8_MEMBER(starcrus_coll_det_r); virtual void video_start(); + UINT32 screen_update_starcrus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/starcrus.c -----------*/ -SCREEN_UPDATE_IND16( starcrus ); + diff --git a/src/mame/includes/starfire.h b/src/mame/includes/starfire.h index b97ab955e3a..158c014b8a2 100644 --- a/src/mame/includes/starfire.h +++ b/src/mame/includes/starfire.h @@ -43,11 +43,12 @@ public: DECLARE_DRIVER_INIT(starfire); DECLARE_DRIVER_INIT(fireone); virtual void video_start(); + UINT32 screen_update_starfire(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/starfire.c -----------*/ -SCREEN_UPDATE_RGB32( starfire ); + diff --git a/src/mame/includes/starshp1.h b/src/mame/includes/starshp1.h index 9cf0fc3bd66..cbcb3de0720 100644 --- a/src/mame/includes/starshp1.h +++ b/src/mame/includes/starshp1.h @@ -78,6 +78,8 @@ public: TILE_GET_INFO_MEMBER(get_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_starshp1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_starshp1(screen_device &screen, bool state); }; @@ -86,8 +88,8 @@ public: -SCREEN_UPDATE_IND16( starshp1 ); -SCREEN_VBLANK( starshp1 ); + + diff --git a/src/mame/includes/stfight.h b/src/mame/includes/stfight.h index 4e367ee70fd..443f279ced8 100644 --- a/src/mame/includes/stfight.h +++ b/src/mame/includes/stfight.h @@ -45,6 +45,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_stfight(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -60,4 +61,4 @@ DECLARE_WRITE8_DEVICE_HANDLER( stfight_adpcm_control_w ); -SCREEN_UPDATE_IND16( stfight ); + diff --git a/src/mame/includes/stlforce.h b/src/mame/includes/stlforce.h index 00fd9df6c79..f21efa4fe9e 100644 --- a/src/mame/includes/stlforce.h +++ b/src/mame/includes/stlforce.h @@ -43,10 +43,11 @@ public: TILE_GET_INFO_MEMBER(get_stlforce_mhigh_tile_info); TILE_GET_INFO_MEMBER(get_stlforce_tx_tile_info); virtual void video_start(); + UINT32 screen_update_stlforce(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/stlforce.c -----------*/ -SCREEN_UPDATE_IND16( stlforce ); + diff --git a/src/mame/includes/strnskil.h b/src/mame/includes/strnskil.h index 676779b48fa..b442ad29822 100644 --- a/src/mame/includes/strnskil.h +++ b/src/mame/includes/strnskil.h @@ -30,6 +30,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_strnskil(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -38,4 +39,4 @@ public: -SCREEN_UPDATE_IND16( strnskil ); + diff --git a/src/mame/includes/stv.h b/src/mame/includes/stv.h index 37bec569c49..10ec8fbf30c 100644 --- a/src/mame/includes/stv.h +++ b/src/mame/includes/stv.h @@ -198,6 +198,8 @@ public: DECLARE_VIDEO_START(stv_vdp2); DECLARE_MACHINE_START(stv); DECLARE_MACHINE_RESET(stv); + UINT32 screen_update_saturn(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_stv_vdp2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; #define MASTER_CLOCK_352 57272720 @@ -262,7 +264,7 @@ DECLARE_WRITE32_HANDLER ( saturn_vdp2_cram_w ); DECLARE_WRITE16_HANDLER ( saturn_vdp2_regs_w ); -SCREEN_UPDATE_RGB32( stv_vdp2 ); + #if NEW_VIDEO_CODE -SCREEN_UPDATE_RGB32( saturn ); + #endif diff --git a/src/mame/includes/subs.h b/src/mame/includes/subs.h index 2ad26b25512..db2b7a23897 100644 --- a/src/mame/includes/subs.h +++ b/src/mame/includes/subs.h @@ -42,6 +42,8 @@ public: DECLARE_WRITE8_MEMBER(subs_invert2_w); virtual void machine_reset(); virtual void palette_init(); + UINT32 screen_update_subs_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_subs_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -64,6 +66,6 @@ DISCRETE_SOUND_EXTERN( subs ); /*----------- defined in video/subs.c -----------*/ -SCREEN_UPDATE_IND16( subs_left ); -SCREEN_UPDATE_IND16( subs_right ); + + diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h index 8b041909e2f..015c0235bc6 100644 --- a/src/mame/includes/suna16.h +++ b/src/mame/includes/suna16.h @@ -36,6 +36,8 @@ public: DECLARE_DRIVER_INIT(uballoon); virtual void video_start(); DECLARE_MACHINE_RESET(uballoon); + UINT32 screen_update_suna16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_bestbest(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -44,5 +46,5 @@ public: -SCREEN_UPDATE_IND16( suna16 ); -SCREEN_UPDATE_IND16( bestbest ); + + diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h index 89612dffbce..06ba09e2db1 100644 --- a/src/mame/includes/suna8.h +++ b/src/mame/includes/suna8.h @@ -103,6 +103,7 @@ public: DECLARE_MACHINE_RESET(brickzn); DECLARE_VIDEO_START(suna8_textdim0); DECLARE_MACHINE_RESET(hardhea2); + UINT32 screen_update_suna8(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -121,4 +122,4 @@ SAMPLES_START( suna8_sh_start ); -SCREEN_UPDATE_IND16( suna8 ); + diff --git a/src/mame/includes/supbtime.h b/src/mame/includes/supbtime.h index 70ed5b58bd8..9a33b75fb20 100644 --- a/src/mame/includes/supbtime.h +++ b/src/mame/includes/supbtime.h @@ -28,10 +28,11 @@ public: DECLARE_READ16_MEMBER(supbtime_controls_r); DECLARE_WRITE16_MEMBER(sound_w); virtual void machine_start(); + UINT32 screen_update_supbtime(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/supbtime.c -----------*/ -SCREEN_UPDATE_IND16( supbtime ); + diff --git a/src/mame/includes/superchs.h b/src/mame/includes/superchs.h index 15d24389159..e97a5478315 100644 --- a/src/mame/includes/superchs.h +++ b/src/mame/includes/superchs.h @@ -38,10 +38,11 @@ public: DECLARE_READ16_MEMBER(sub_cycle_r); DECLARE_DRIVER_INIT(superchs); virtual void video_start(); + UINT32 screen_update_superchs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/superchs.c -----------*/ -SCREEN_UPDATE_IND16( superchs ); + diff --git a/src/mame/includes/superqix.h b/src/mame/includes/superqix.h index 4120e28a03f..f8d152cbf55 100644 --- a/src/mame/includes/superqix.h +++ b/src/mame/includes/superqix.h @@ -76,6 +76,8 @@ public: DECLARE_VIDEO_START(pbillian); DECLARE_MACHINE_START(superqix); DECLARE_VIDEO_START(superqix); + UINT32 screen_update_pbillian(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_superqix(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -83,6 +85,6 @@ public: -SCREEN_UPDATE_IND16( pbillian ); -SCREEN_UPDATE_IND16( superqix ); + + diff --git a/src/mame/includes/suprloco.h b/src/mame/includes/suprloco.h index 4c0320b8c1e..fed79be7c77 100644 --- a/src/mame/includes/suprloco.h +++ b/src/mame/includes/suprloco.h @@ -22,6 +22,7 @@ public: TILE_GET_INFO_MEMBER(get_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_suprloco(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -29,4 +30,4 @@ public: -SCREEN_UPDATE_IND16( suprloco ); + diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h index 6804d35abb2..5185fb590f9 100644 --- a/src/mame/includes/suprnova.h +++ b/src/mame/includes/suprnova.h @@ -134,6 +134,8 @@ public: DECLARE_MACHINE_RESET(sknsu); DECLARE_MACHINE_RESET(sknse); DECLARE_MACHINE_RESET(sknsk); + UINT32 screen_update_skns(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void screen_eof_skns(screen_device &screen, bool state); }; @@ -148,5 +150,5 @@ void skns_draw_sprites( -SCREEN_VBLANK(skns); -SCREEN_UPDATE_RGB32(skns); + + diff --git a/src/mame/includes/suprridr.h b/src/mame/includes/suprridr.h index d9131985992..d72c6f28125 100644 --- a/src/mame/includes/suprridr.h +++ b/src/mame/includes/suprridr.h @@ -40,6 +40,7 @@ public: TILE_GET_INFO_MEMBER(get_tile_info2); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_suprridr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -51,4 +52,4 @@ public: int suprridr_is_screen_flipped(running_machine &machine); -SCREEN_UPDATE_IND16( suprridr ); + diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h index 7ad0a1d061f..7dd283b8e3e 100644 --- a/src/mame/includes/suprslam.h +++ b/src/mame/includes/suprslam.h @@ -49,6 +49,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_suprslam(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -56,4 +57,4 @@ public: -SCREEN_UPDATE_IND16( suprslam ); + diff --git a/src/mame/includes/surpratk.h b/src/mame/includes/surpratk.h index 8631bd3a116..29eaa70dd50 100644 --- a/src/mame/includes/surpratk.h +++ b/src/mame/includes/surpratk.h @@ -34,6 +34,7 @@ public: DECLARE_WRITE8_MEMBER(surpratk_5fc0_w); virtual void machine_start(); virtual void machine_reset(); + UINT32 screen_update_surpratk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/surpratk.c -----------*/ @@ -41,4 +42,4 @@ public: extern void surpratk_tile_callback(running_machine &machine, int layer,int bank,int *code,int *color,int *flags,int *priority); extern void surpratk_sprite_callback(running_machine &machine, int *code,int *color,int *priority_mask); -SCREEN_UPDATE_IND16( surpratk ); + diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h index f8296321042..c2ce9f251ec 100644 --- a/src/mame/includes/system1.h +++ b/src/mame/includes/system1.h @@ -104,6 +104,9 @@ public: virtual void video_start(); DECLARE_MACHINE_START(system2); DECLARE_VIDEO_START(system2); + UINT32 screen_update_system1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_system2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_system2_rowscroll(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -117,6 +120,6 @@ DECLARE_WRITE8_DEVICE_HANDLER( system1_videoram_bank_w ); -SCREEN_UPDATE_IND16( system1 ); -SCREEN_UPDATE_IND16( system2 ); -SCREEN_UPDATE_IND16( system2_rowscroll ); + + + diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h index 43dd9f42112..775fd757b26 100644 --- a/src/mame/includes/system16.h +++ b/src/mame/includes/system16.h @@ -189,6 +189,10 @@ public: DECLARE_VIDEO_START(s16a_bootleg_passsht); DECLARE_VIDEO_START(s16a_bootleg_wb3bl); DECLARE_VIDEO_START(s16a_bootleg); + UINT32 screen_update_system16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_system18old(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_s16a_bootleg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_s16a_bootleg_passht4b(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/system16.c -----------*/ diff --git a/src/mame/includes/tagteam.h b/src/mame/includes/tagteam.h index 6a00b1becc5..3161cca8991 100644 --- a/src/mame/includes/tagteam.h +++ b/src/mame/includes/tagteam.h @@ -27,6 +27,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_tagteam(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -35,4 +36,4 @@ public: -SCREEN_UPDATE_IND16( tagteam ); + diff --git a/src/mame/includes/tail2nos.h b/src/mame/includes/tail2nos.h index 539481da45d..49cb0ad5fed 100644 --- a/src/mame/includes/tail2nos.h +++ b/src/mame/includes/tail2nos.h @@ -38,6 +38,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_tail2nos(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -47,4 +48,4 @@ extern void tail2nos_zoom_callback(running_machine &machine, int *code,int *colo -SCREEN_UPDATE_IND16( tail2nos ); + diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h index 21c2c171e4f..357507766b3 100644 --- a/src/mame/includes/taito_b.h +++ b/src/mame/includes/taito_b.h @@ -70,6 +70,9 @@ public: DECLARE_VIDEO_RESET(hitice); DECLARE_VIDEO_START(realpunc); DECLARE_VIDEO_START(taitob_core); + UINT32 screen_update_taitob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_realpunc(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void screen_eof_taitob(screen_device &screen, bool state); }; @@ -86,7 +89,7 @@ public: -SCREEN_UPDATE_RGB32( realpunc ); -SCREEN_UPDATE_IND16( taitob ); -SCREEN_VBLANK( taitob ); + + + diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h index 1dfd5f49bd3..60c915abf3b 100644 --- a/src/mame/includes/taito_f2.h +++ b/src/mame/includes/taito_f2.h @@ -129,6 +129,19 @@ public: DECLARE_VIDEO_START(taitof2_deadconxj); DECLARE_VIDEO_START(taitof2_dinorex); DECLARE_VIDEO_START(taitof2_quiz); + UINT32 screen_update_taitof2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_taitof2_pri_roz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_taitof2_pri(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_taitof2_thundfox(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_taitof2_ssi(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_taitof2_deadconx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_taitof2_yesnoj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_taitof2_metalb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_taitof2_no_buffer(screen_device &screen, bool state); + void screen_eof_taitof2_partial_buffer_delayed(screen_device &screen, bool state); + void screen_eof_taitof2_partial_buffer_delayed_thundfox(screen_device &screen, bool state); + void screen_eof_taitof2_full_buffer_delayed(screen_device &screen, bool state); + void screen_eof_taitof2_partial_buffer_delayed_qzchikyu(screen_device &screen, bool state); }; /*----------- defined in video/taito_f2.c -----------*/ @@ -157,18 +170,18 @@ public: -SCREEN_VBLANK( taitof2_no_buffer ); -SCREEN_VBLANK( taitof2_full_buffer_delayed ); -SCREEN_VBLANK( taitof2_partial_buffer_delayed ); -SCREEN_VBLANK( taitof2_partial_buffer_delayed_thundfox ); -SCREEN_VBLANK( taitof2_partial_buffer_delayed_qzchikyu ); -SCREEN_UPDATE_IND16( taitof2 ); -SCREEN_UPDATE_IND16( taitof2_pri ); -SCREEN_UPDATE_IND16( taitof2_pri_roz ); -SCREEN_UPDATE_IND16( taitof2_ssi ); -SCREEN_UPDATE_IND16( taitof2_thundfox ); -SCREEN_UPDATE_IND16( taitof2_deadconx ); -SCREEN_UPDATE_IND16( taitof2_metalb ); -SCREEN_UPDATE_IND16( taitof2_yesnoj ); + + + + + + + + + + + + + diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h index 3da24e10e49..e9e406dd075 100644 --- a/src/mame/includes/taito_f3.h +++ b/src/mame/includes/taito_f3.h @@ -270,13 +270,15 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_pixel); DECLARE_MACHINE_START(f3); DECLARE_VIDEO_START(f3); + UINT32 screen_update_f3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void screen_eof_f3(screen_device &screen, bool state); }; /*----------- defined in video/taito_f3.c -----------*/ -SCREEN_UPDATE_RGB32( f3 ); -SCREEN_VBLANK( f3 ); + + diff --git a/src/mame/includes/taito_h.h b/src/mame/includes/taito_h.h index 2e81a887648..513bead5993 100644 --- a/src/mame/includes/taito_h.h +++ b/src/mame/includes/taito_h.h @@ -27,10 +27,13 @@ public: DECLARE_WRITE8_MEMBER(sound_bankswitch_w); virtual void machine_start(); virtual void machine_reset(); + UINT32 screen_update_syvalion(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_recordbr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_dleague(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/taito_h.c -----------*/ -SCREEN_UPDATE_IND16( syvalion ); -SCREEN_UPDATE_IND16( recordbr ); -SCREEN_UPDATE_IND16( dleague ); + + + diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h index 53205a9697b..143aa3fbd65 100644 --- a/src/mame/includes/taito_l.h +++ b/src/mame/includes/taito_l.h @@ -119,13 +119,15 @@ public: DECLARE_MACHINE_RESET(horshoes); DECLARE_MACHINE_RESET(palamed); DECLARE_MACHINE_RESET(cachat); + UINT32 screen_update_taitol(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_taitol(screen_device &screen, bool state); }; /*----------- defined in video/taito_l.c -----------*/ -SCREEN_VBLANK( taitol ); -SCREEN_UPDATE_IND16( taitol ); + + void taitol_chardef14_m(running_machine &machine, int offset); void taitol_chardef15_m(running_machine &machine, int offset); diff --git a/src/mame/includes/taito_o.h b/src/mame/includes/taito_o.h index 8110f2f5040..e57a2c63a39 100644 --- a/src/mame/includes/taito_o.h +++ b/src/mame/includes/taito_o.h @@ -19,8 +19,9 @@ public: DECLARE_WRITE16_MEMBER(io_w); DECLARE_READ16_MEMBER(io_r); virtual void machine_start(); + UINT32 screen_update_parentj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/taito_o.c -----------*/ -SCREEN_UPDATE_IND16( parentj ); + diff --git a/src/mame/includes/taito_z.h b/src/mame/includes/taito_z.h index 2a94a266fb0..984857c35b2 100644 --- a/src/mame/includes/taito_z.h +++ b/src/mame/includes/taito_z.h @@ -77,6 +77,14 @@ public: DECLARE_MACHINE_RESET(taitoz); DECLARE_VIDEO_START(taitoz); DECLARE_MACHINE_START(bshark); + UINT32 screen_update_contcirc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_chasehq(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_bshark(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_sci(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_aquajack(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_spacegun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_dblaxle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_racingb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/taito_z.c -----------*/ @@ -84,11 +92,11 @@ public: -SCREEN_UPDATE_IND16( contcirc ); -SCREEN_UPDATE_IND16( chasehq ); -SCREEN_UPDATE_IND16( bshark ); -SCREEN_UPDATE_IND16( sci ); -SCREEN_UPDATE_IND16( aquajack ); -SCREEN_UPDATE_IND16( spacegun ); -SCREEN_UPDATE_IND16( dblaxle ); -SCREEN_UPDATE_IND16( racingb ); + + + + + + + + diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h index 9f4b5f36a56..1ad8e848576 100644 --- a/src/mame/includes/taitoair.h +++ b/src/mame/includes/taitoair.h @@ -82,12 +82,13 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_taitoair(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/taitoair.c -----------*/ -SCREEN_UPDATE_IND16( taitoair ); + diff --git a/src/mame/includes/taitojc.h b/src/mame/includes/taitojc.h index da3a46862ae..34b2248c679 100644 --- a/src/mame/includes/taitojc.h +++ b/src/mame/includes/taitojc.h @@ -159,6 +159,8 @@ public: TILE_GET_INFO_MEMBER(taitojc_tile_info); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_taitojc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_dendego(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -168,8 +170,8 @@ void taitojc_clear_frame(running_machine &machine); void taitojc_render_polygons(running_machine &machine, UINT16 *polygon_fifo, int length); -SCREEN_UPDATE_IND16(taitojc); -SCREEN_UPDATE_IND16(dendego); + + // lookup tables for densha de go analog controls/meters const int dendego_odometer_table[0x100] = diff --git a/src/mame/includes/taitosj.h b/src/mame/includes/taitosj.h index 681a9ef2d3c..92b8df20826 100644 --- a/src/mame/includes/taitosj.h +++ b/src/mame/includes/taitosj.h @@ -88,6 +88,8 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_taitosj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_kikstart(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -101,5 +103,5 @@ public: /*----------- defined in video/taitosj.c -----------*/ -SCREEN_UPDATE_IND16( taitosj ); -SCREEN_UPDATE_IND16( kikstart ); + + diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h index f91aa944d00..657b2e76f0e 100644 --- a/src/mame/includes/tank8.h +++ b/src/mame/includes/tank8.h @@ -59,6 +59,8 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_tank8(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_tank8(screen_device &screen, bool state); }; @@ -75,9 +77,9 @@ void tank8_set_collision(running_machine &machine, int index); /*----------- defined in video/tank8.c -----------*/ -SCREEN_VBLANK( tank8 ); -SCREEN_UPDATE_IND16( tank8 ); + + diff --git a/src/mame/includes/tankbatt.h b/src/mame/includes/tankbatt.h index 5c8ffae47f7..2819694ac7e 100644 --- a/src/mame/includes/tankbatt.h +++ b/src/mame/includes/tankbatt.h @@ -29,6 +29,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_tankbatt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -37,4 +38,4 @@ public: -SCREEN_UPDATE_IND16( tankbatt ); + diff --git a/src/mame/includes/tankbust.h b/src/mame/includes/tankbust.h index 3023f0567b8..f846cc4af8c 100644 --- a/src/mame/includes/tankbust.h +++ b/src/mame/includes/tankbust.h @@ -42,13 +42,14 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_tankbust(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/tankbust.c -----------*/ -SCREEN_UPDATE_IND16( tankbust ); + diff --git a/src/mame/includes/taotaido.h b/src/mame/includes/taotaido.h index 3becb7a55f7..7501d9fccfa 100644 --- a/src/mame/includes/taotaido.h +++ b/src/mame/includes/taotaido.h @@ -30,11 +30,13 @@ public: TILE_GET_INFO_MEMBER(taotaido_bg_tile_info); TILEMAP_MAPPER_MEMBER(taotaido_tilemap_scan_rows); virtual void video_start(); + UINT32 screen_update_taotaido(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_taotaido(screen_device &screen, bool state); }; /*----------- defined in video/taotaido.c -----------*/ -SCREEN_UPDATE_IND16( taotaido ); -SCREEN_VBLANK( taotaido ); + + diff --git a/src/mame/includes/targeth.h b/src/mame/includes/targeth.h index 7d1629b3566..b059c97b27f 100644 --- a/src/mame/includes/targeth.h +++ b/src/mame/includes/targeth.h @@ -20,10 +20,11 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_targeth_screen0); TILE_GET_INFO_MEMBER(get_tile_info_targeth_screen1); virtual void video_start(); + UINT32 screen_update_targeth(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/targeth.c -----------*/ -SCREEN_UPDATE_IND16( targeth ); + diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h index be44145d436..f89250f5d28 100644 --- a/src/mame/includes/tatsumi.h +++ b/src/mame/includes/tatsumi.h @@ -120,6 +120,10 @@ public: DECLARE_VIDEO_START(roundup5); DECLARE_VIDEO_START(cyclwarr); DECLARE_VIDEO_START(bigfight); + UINT32 screen_update_apache3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_roundup5(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_cyclwarr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_bigfight(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -141,8 +145,8 @@ void tatsumi_reset(running_machine &machine); -SCREEN_UPDATE_RGB32( roundup5 ); -SCREEN_UPDATE_RGB32( apache3 ); -SCREEN_UPDATE_RGB32( cyclwarr ); -SCREEN_UPDATE_RGB32( bigfight ); + + + + diff --git a/src/mame/includes/taxidriv.h b/src/mame/includes/taxidriv.h index 9db11ed694e..8cdbe960f84 100644 --- a/src/mame/includes/taxidriv.h +++ b/src/mame/includes/taxidriv.h @@ -51,9 +51,10 @@ public: DECLARE_READ8_MEMBER(p8910_1a_r); DECLARE_WRITE8_MEMBER(p8910_0b_w); DECLARE_WRITE8_MEMBER(taxidriv_spritectrl_w); + UINT32 screen_update_taxidriv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/taxidriv.c -----------*/ -SCREEN_UPDATE_IND16( taxidriv ); + diff --git a/src/mame/includes/tbowl.h b/src/mame/includes/tbowl.h index 6961a53d227..035bcc6cb75 100644 --- a/src/mame/includes/tbowl.h +++ b/src/mame/includes/tbowl.h @@ -50,6 +50,8 @@ public: TILE_GET_INFO_MEMBER(get_bg2_tile_info); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_tbowl_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_tbowl_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -58,6 +60,6 @@ public: -SCREEN_UPDATE_IND16( tbowl_left ); -SCREEN_UPDATE_IND16( tbowl_right ); + + diff --git a/src/mame/includes/tceptor.h b/src/mame/includes/tceptor.h index 19199f0ff0e..5979d184a40 100644 --- a/src/mame/includes/tceptor.h +++ b/src/mame/includes/tceptor.h @@ -60,6 +60,10 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_tceptor_2d(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_tceptor_3d_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_tceptor_3d_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_tceptor(screen_device &screen, bool state); }; @@ -67,9 +71,9 @@ public: -SCREEN_UPDATE_IND16( tceptor_2d ); -SCREEN_UPDATE_IND16( tceptor_3d_left ); -SCREEN_UPDATE_IND16( tceptor_3d_right ); -SCREEN_VBLANK( tceptor ); + + + + diff --git a/src/mame/includes/tecmo.h b/src/mame/includes/tecmo.h index 90448b7c5dc..b18f8c87c2a 100644 --- a/src/mame/includes/tecmo.h +++ b/src/mame/includes/tecmo.h @@ -48,6 +48,7 @@ public: TILE_GET_INFO_MEMBER(get_tx_tile_info); DECLARE_MACHINE_RESET(rygar); DECLARE_VIDEO_START(tecmo); + UINT32 screen_update_tecmo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -55,4 +56,4 @@ public: -SCREEN_UPDATE_IND16( tecmo ); + diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h index 6db07f1fcb0..d37023bbb2e 100644 --- a/src/mame/includes/tecmo16.h +++ b/src/mame/includes/tecmo16.h @@ -49,6 +49,7 @@ public: virtual void video_start(); DECLARE_VIDEO_START(ginkun); DECLARE_VIDEO_START(riot); + UINT32 screen_update_tecmo16(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -59,4 +60,4 @@ public: -SCREEN_UPDATE_RGB32( tecmo16 ); + diff --git a/src/mame/includes/tecmosys.h b/src/mame/includes/tecmosys.h index 544a57f18be..8ca32f5d9f0 100644 --- a/src/mame/includes/tecmosys.h +++ b/src/mame/includes/tecmosys.h @@ -79,6 +79,7 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); virtual void machine_start(); virtual void video_start(); + UINT32 screen_update_tecmosys(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -91,5 +92,5 @@ void tecmosys_prot_init(running_machine &machine, int which); /*----------- defined in video/tecmosys.c -----------*/ -SCREEN_UPDATE_RGB32(tecmosys); + diff --git a/src/mame/includes/tehkanwc.h b/src/mame/includes/tehkanwc.h index a7822883a1b..f5248363182 100644 --- a/src/mame/includes/tehkanwc.h +++ b/src/mame/includes/tehkanwc.h @@ -46,6 +46,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); virtual void video_start(); + UINT32 screen_update_tehkanwc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/terracre.h b/src/mame/includes/terracre.h index 3ff643d5ed4..89892ac85b5 100644 --- a/src/mame/includes/terracre.h +++ b/src/mame/includes/terracre.h @@ -36,6 +36,7 @@ public: virtual void video_start(); virtual void palette_init(); DECLARE_MACHINE_START(amazon); + UINT32 screen_update_amazon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -43,4 +44,4 @@ public: -SCREEN_UPDATE_IND16( amazon ); + diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h index be45e93012d..c024cf58041 100644 --- a/src/mame/includes/tetrisp2.h +++ b/src/mame/includes/tetrisp2.h @@ -106,6 +106,10 @@ public: DECLARE_VIDEO_START(nndmseal); DECLARE_VIDEO_START(rockntread); DECLARE_VIDEO_START(rocknms); + UINT32 screen_update_tetrisp2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_rockntread(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_rocknms_left(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_rocknms_right(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; class stepstag_state : public tetrisp2_state @@ -125,6 +129,9 @@ public: DECLARE_WRITE16_MEMBER( stepstag_palette_w ); DECLARE_DRIVER_INIT(stepstag); DECLARE_VIDEO_START(stepstag); + UINT32 screen_update_stepstag_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_stepstag_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_stepstag_mid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/tetrisp2.c -----------*/ @@ -133,18 +140,18 @@ public: -SCREEN_UPDATE_IND16( tetrisp2 ); -SCREEN_UPDATE_IND16( rockntread ); -SCREEN_UPDATE_RGB32( rocknms_left ); -SCREEN_UPDATE_RGB32( rocknms_right ); -SCREEN_UPDATE_IND16( stepstag_left ); -SCREEN_UPDATE_IND16( stepstag_mid ); -SCREEN_UPDATE_IND16( stepstag_right ); + + + + + + + diff --git a/src/mame/includes/thedeep.h b/src/mame/includes/thedeep.h index f7446afe6cc..6f8c9bd143f 100644 --- a/src/mame/includes/thedeep.h +++ b/src/mame/includes/thedeep.h @@ -49,6 +49,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_thedeep(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -57,5 +58,5 @@ public: -SCREEN_UPDATE_IND16( thedeep ); + diff --git a/src/mame/includes/thepit.h b/src/mame/includes/thepit.h index 9b4f84cd7ab..1f72a6a0cb3 100644 --- a/src/mame/includes/thepit.h +++ b/src/mame/includes/thepit.h @@ -38,6 +38,7 @@ public: virtual void video_start(); virtual void palette_init(); DECLARE_PALETTE_INIT(suprmous); + UINT32 screen_update_thepit(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -46,4 +47,4 @@ public: -SCREEN_UPDATE_IND16( thepit ); + diff --git a/src/mame/includes/thief.h b/src/mame/includes/thief.h index 3e155ab3908..425f1bde82e 100644 --- a/src/mame/includes/thief.h +++ b/src/mame/includes/thief.h @@ -33,6 +33,7 @@ public: DECLARE_WRITE8_MEMBER(tape_control_w); DECLARE_DRIVER_INIT(thief); virtual void video_start(); + UINT32 screen_update_thief(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -40,4 +41,4 @@ public: -SCREEN_UPDATE_IND16( thief ); + diff --git a/src/mame/includes/thoop2.h b/src/mame/includes/thoop2.h index 1fec90792d1..43a33a42262 100644 --- a/src/mame/includes/thoop2.h +++ b/src/mame/includes/thoop2.h @@ -20,10 +20,11 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_thoop2_screen0); TILE_GET_INFO_MEMBER(get_tile_info_thoop2_screen1); virtual void video_start(); + UINT32 screen_update_thoop2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/thoop2.c -----------*/ -SCREEN_UPDATE_IND16( thoop2 ); + diff --git a/src/mame/includes/thunderj.h b/src/mame/includes/thunderj.h index 3c082872e1d..0120128846c 100644 --- a/src/mame/includes/thunderj.h +++ b/src/mame/includes/thunderj.h @@ -24,10 +24,11 @@ public: DECLARE_MACHINE_START(thunderj); DECLARE_MACHINE_RESET(thunderj); DECLARE_VIDEO_START(thunderj); + UINT32 screen_update_thunderj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/thunderj.c -----------*/ -SCREEN_UPDATE_IND16( thunderj ); + diff --git a/src/mame/includes/thunderx.h b/src/mame/includes/thunderx.h index b0614d553db..39a50644410 100644 --- a/src/mame/includes/thunderx.h +++ b/src/mame/includes/thunderx.h @@ -50,6 +50,7 @@ public: DECLARE_MACHINE_RESET(scontra); DECLARE_MACHINE_START(thunderx); DECLARE_MACHINE_RESET(thunderx); + UINT32 screen_update_scontra(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -59,4 +60,4 @@ extern void thunderx_tile_callback(running_machine &machine, int layer,int bank, extern void thunderx_sprite_callback(running_machine &machine, int *code,int *color,int *priority_mask,int *shadow); -SCREEN_UPDATE_IND16( scontra ); + diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h index cfe3875d1a2..b705619ecca 100644 --- a/src/mame/includes/tiamc1.h +++ b/src/mame/includes/tiamc1.h @@ -33,6 +33,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_tiamc1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -71,5 +72,5 @@ DECLARE_WRITE8_DEVICE_HANDLER( tiamc1_timer1_gate_w ); -SCREEN_UPDATE_IND16( tiamc1 ); + diff --git a/src/mame/includes/tigeroad.h b/src/mame/includes/tigeroad.h index 84cf7715938..5b9735993c6 100644 --- a/src/mame/includes/tigeroad.h +++ b/src/mame/includes/tigeroad.h @@ -27,10 +27,11 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); TILEMAP_MAPPER_MEMBER(tigeroad_tilemap_scan); virtual void video_start(); + UINT32 screen_update_tigeroad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/tigeroad.c -----------*/ -SCREEN_UPDATE_IND16( tigeroad ); + diff --git a/src/mame/includes/timelimt.h b/src/mame/includes/timelimt.h index 59007202114..1853eb734a2 100644 --- a/src/mame/includes/timelimt.h +++ b/src/mame/includes/timelimt.h @@ -28,6 +28,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_timelimt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -35,5 +36,5 @@ public: -SCREEN_UPDATE_IND16( timelimt ); + diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h index ed13097c20a..ca886e9462b 100644 --- a/src/mame/includes/timeplt.h +++ b/src/mame/includes/timeplt.h @@ -50,6 +50,7 @@ public: virtual void video_start(); virtual void palette_init(); DECLARE_VIDEO_START(chkun); + UINT32 screen_update_timeplt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -59,4 +60,4 @@ public: -SCREEN_UPDATE_IND16( timeplt ); + diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h index 4021243e5a3..a7ac603cf63 100644 --- a/src/mame/includes/tmnt.h +++ b/src/mame/includes/tmnt.h @@ -132,6 +132,14 @@ public: DECLARE_VIDEO_START(glfgreat); DECLARE_MACHINE_START(prmrsocr); DECLARE_VIDEO_START(prmrsocr); + UINT32 screen_update_mia(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_tmnt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_punkshot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_lgtnfght(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_glfgreat(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_tmnt2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_thndrx2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_blswhstl(screen_device &screen, bool state); }; @@ -159,12 +167,12 @@ extern void prmrsocr_sprite_callback(running_machine &machine, int *code,int *co -SCREEN_UPDATE_IND16( mia ); -SCREEN_UPDATE_IND16( tmnt ); -SCREEN_UPDATE_IND16( punkshot ); -SCREEN_UPDATE_IND16( lgtnfght ); -SCREEN_UPDATE_IND16( glfgreat ); -SCREEN_UPDATE_IND16( tmnt2 ); -SCREEN_UPDATE_IND16( thndrx2 ); -SCREEN_VBLANK( blswhstl ); + + + + + + + + diff --git a/src/mame/includes/tnzs.h b/src/mame/includes/tnzs.h index c880a55172a..51366adfe17 100644 --- a/src/mame/includes/tnzs.h +++ b/src/mame/includes/tnzs.h @@ -96,6 +96,8 @@ public: DECLARE_PALETTE_INIT(arknoid2); DECLARE_MACHINE_START(jpopnics); DECLARE_MACHINE_RESET(jpopnics); + UINT32 screen_update_tnzs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_tnzs(screen_device &screen, bool state); }; @@ -113,5 +115,5 @@ INTERRUPT_GEN( arknoid2_interrupt ); /*----------- defined in video/tnzs.c -----------*/ -SCREEN_UPDATE_IND16( tnzs ); -SCREEN_VBLANK( tnzs ); + + diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h index 5eb70418eb9..c1464ac9dc8 100644 --- a/src/mame/includes/toaplan1.h +++ b/src/mame/includes/toaplan1.h @@ -138,6 +138,11 @@ public: DECLARE_MACHINE_RESET(zerowing); DECLARE_MACHINE_RESET(demonwld); DECLARE_MACHINE_RESET(vimana); + UINT32 screen_update_rallybik(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_toaplan1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_rallybik(screen_device &screen, bool state); + void screen_eof_toaplan1(screen_device &screen, bool state); + void screen_eof_samesame(screen_device &screen, bool state); }; @@ -160,10 +165,10 @@ void vimana_driver_savestate(running_machine &machine); -SCREEN_VBLANK( rallybik ); -SCREEN_VBLANK( toaplan1 ); -SCREEN_VBLANK( samesame ); -SCREEN_UPDATE_IND16( rallybik ); -SCREEN_UPDATE_IND16( toaplan1 ); + + + + + diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h index 698047ef63e..e50b8ff6a2b 100644 --- a/src/mame/includes/toaplan2.h +++ b/src/mame/includes/toaplan2.h @@ -119,6 +119,14 @@ public: DECLARE_VIDEO_START(bgaregga); DECLARE_VIDEO_START(batrider); DECLARE_VIDEO_START(bgareggabl); + UINT32 screen_update_toaplan2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_dogyuun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_truxton2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_batsugun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_batrider(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_toaplan2_dual(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_toaplan2_mixed(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_toaplan2(screen_device &screen, bool state); }; /*----------- defined in video/toaplan2.c -----------*/ @@ -130,13 +138,13 @@ public: -SCREEN_UPDATE_IND16( toaplan2 ); -SCREEN_UPDATE_IND16( truxton2 ); -SCREEN_UPDATE_IND16( batrider ); -SCREEN_UPDATE_IND16( dogyuun ); -SCREEN_UPDATE_IND16( batsugun ); -SCREEN_VBLANK( toaplan2 ); + + + + + + /* non-vdp text layer */ diff --git a/src/mame/includes/toki.h b/src/mame/includes/toki.h index 3a6de58bb85..bf4defb1383 100644 --- a/src/mame/includes/toki.h +++ b/src/mame/includes/toki.h @@ -38,11 +38,13 @@ public: TILE_GET_INFO_MEMBER(get_back_tile_info); TILE_GET_INFO_MEMBER(get_fore_tile_info); virtual void video_start(); + UINT32 screen_update_toki(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_tokib(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/toki.c -----------*/ -SCREEN_UPDATE_IND16( toki ); -SCREEN_UPDATE_IND16( tokib ); + + diff --git a/src/mame/includes/toobin.h b/src/mame/includes/toobin.h index b9cdcb45322..4584d900a4f 100644 --- a/src/mame/includes/toobin.h +++ b/src/mame/includes/toobin.h @@ -25,6 +25,7 @@ public: DECLARE_MACHINE_START(toobin); DECLARE_MACHINE_RESET(toobin); DECLARE_VIDEO_START(toobin); + UINT32 screen_update_toobin(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -37,4 +38,4 @@ DECLARE_WRITE16_HANDLER( toobin_yscroll_w ); DECLARE_WRITE16_HANDLER( toobin_slip_w ); -SCREEN_UPDATE_RGB32( toobin ); + diff --git a/src/mame/includes/topspeed.h b/src/mame/includes/topspeed.h index b354a4a8704..d09c67a307d 100644 --- a/src/mame/includes/topspeed.h +++ b/src/mame/includes/topspeed.h @@ -54,9 +54,10 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(topspeed_pedal_r); virtual void machine_start(); virtual void machine_reset(); + UINT32 screen_update_topspeed(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/topspeed.c -----------*/ -SCREEN_UPDATE_IND16( topspeed ); + diff --git a/src/mame/includes/toypop.h b/src/mame/includes/toypop.h index d5c9120814c..5553ffc9d8f 100644 --- a/src/mame/includes/toypop.h +++ b/src/mame/includes/toypop.h @@ -49,11 +49,12 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_toypop(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/toypop.c -----------*/ -SCREEN_UPDATE_IND16( toypop ); + diff --git a/src/mame/includes/tp84.h b/src/mame/includes/tp84.h index f38e4dc2834..ff7ab0059f1 100644 --- a/src/mame/includes/tp84.h +++ b/src/mame/includes/tp84.h @@ -40,6 +40,7 @@ public: virtual void machine_start(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_tp84(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -48,4 +49,4 @@ public: -SCREEN_UPDATE_IND16( tp84 ); + diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h index d6199ad94c1..6882fd7fa83 100644 --- a/src/mame/includes/trackfld.h +++ b/src/mame/includes/trackfld.h @@ -65,6 +65,7 @@ public: DECLARE_VIDEO_START(trackfld); DECLARE_PALETTE_INIT(trackfld); DECLARE_VIDEO_START(atlantol); + UINT32 screen_update_trackfld(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -73,6 +74,6 @@ public: -SCREEN_UPDATE_IND16( trackfld ); + diff --git a/src/mame/includes/travrusa.h b/src/mame/includes/travrusa.h index d98a838de2b..008d3c3e7ef 100644 --- a/src/mame/includes/travrusa.h +++ b/src/mame/includes/travrusa.h @@ -24,6 +24,7 @@ public: virtual void video_start(); virtual void palette_init(); DECLARE_PALETTE_INIT(shtrider); + UINT32 screen_update_travrusa(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/travrusa.c -----------*/ @@ -32,4 +33,4 @@ public: -SCREEN_UPDATE_IND16( travrusa ); + diff --git a/src/mame/includes/triplhnt.h b/src/mame/includes/triplhnt.h index 1a1f9affbd9..a068a64d4e3 100644 --- a/src/mame/includes/triplhnt.h +++ b/src/mame/includes/triplhnt.h @@ -50,6 +50,7 @@ public: TILE_GET_INFO_MEMBER(get_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_triplhnt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -67,6 +68,6 @@ extern const samples_interface triplhnt_samples_interface; /*----------- defined in video/triplhnt.c -----------*/ -SCREEN_UPDATE_IND16( triplhnt ); + diff --git a/src/mame/includes/truco.h b/src/mame/includes/truco.h index 46717833a17..9fa32a2c023 100644 --- a/src/mame/includes/truco.h +++ b/src/mame/includes/truco.h @@ -16,10 +16,11 @@ public: DECLARE_WRITE8_MEMBER(pia_irqb_w); virtual void machine_reset(); virtual void palette_init(); + UINT32 screen_update_truco(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/truco.c -----------*/ -SCREEN_UPDATE_IND16( truco ); + diff --git a/src/mame/includes/trucocl.h b/src/mame/includes/trucocl.h index 064de31f262..c3a0b496d4b 100644 --- a/src/mame/includes/trucocl.h +++ b/src/mame/includes/trucocl.h @@ -21,6 +21,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_trucocl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -28,4 +29,4 @@ public: -SCREEN_UPDATE_IND16( trucocl ); + diff --git a/src/mame/includes/tryout.h b/src/mame/includes/tryout.h index a105af08149..464c821a1a7 100644 --- a/src/mame/includes/tryout.h +++ b/src/mame/includes/tryout.h @@ -34,6 +34,7 @@ public: TILEMAP_MAPPER_MEMBER(get_bg_memory_offset); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_tryout(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -42,4 +43,4 @@ public: -SCREEN_UPDATE_IND16( tryout ); + diff --git a/src/mame/includes/tsamurai.h b/src/mame/includes/tsamurai.h index 7001cf56380..1ca30304287 100644 --- a/src/mame/includes/tsamurai.h +++ b/src/mame/includes/tsamurai.h @@ -57,6 +57,8 @@ public: TILE_GET_INFO_MEMBER(get_vsgongf_tile_info); DECLARE_VIDEO_START(tsamurai); DECLARE_VIDEO_START(vsgongf); + UINT32 screen_update_tsamurai(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_vsgongf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -66,7 +68,7 @@ public: -SCREEN_UPDATE_IND16( tsamurai ); -SCREEN_UPDATE_IND16( vsgongf ); + + diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h index f50cecd6605..5abba37435c 100644 --- a/src/mame/includes/tubep.h +++ b/src/mame/includes/tubep.h @@ -76,6 +76,8 @@ public: DECLARE_MACHINE_START(rjammer); DECLARE_MACHINE_RESET(rjammer); DECLARE_PALETTE_INIT(rjammer); + UINT32 screen_update_tubep(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_rjammer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -83,9 +85,9 @@ public: void tubep_vblank_end(running_machine &machine); -SCREEN_UPDATE_IND16( tubep ); -SCREEN_UPDATE_IND16( rjammer ); + + diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h index 1cf72cd3128..e09a331fb5d 100644 --- a/src/mame/includes/tumbleb.h +++ b/src/mame/includes/tumbleb.h @@ -91,18 +91,28 @@ public: DECLARE_VIDEO_START(suprtrio); DECLARE_VIDEO_START(pangpang); DECLARE_VIDEO_START(sdfight); + UINT32 screen_update_tumblepb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_jumpkids(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_fncywld(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_semicom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_suprtrio(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_pangpang(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_semicom_altoffsets(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_bcstory(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_semibase(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_sdfight(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/tumbleb.c -----------*/ -SCREEN_UPDATE_IND16( tumblepb ); -SCREEN_UPDATE_IND16( jumpkids ); -SCREEN_UPDATE_IND16( fncywld ); -SCREEN_UPDATE_IND16( semicom ); -SCREEN_UPDATE_IND16( semicom_altoffsets ); -SCREEN_UPDATE_IND16( bcstory ); -SCREEN_UPDATE_IND16( semibase ); -SCREEN_UPDATE_IND16( suprtrio ); -SCREEN_UPDATE_IND16( pangpang ); -SCREEN_UPDATE_IND16( sdfight ); + + + + + + + + + + diff --git a/src/mame/includes/tumblep.h b/src/mame/includes/tumblep.h index 235348539ab..068caedad90 100644 --- a/src/mame/includes/tumblep.h +++ b/src/mame/includes/tumblep.h @@ -30,10 +30,11 @@ public: DECLARE_WRITE16_MEMBER(tumblep_oki_w); DECLARE_DRIVER_INIT(tumblep); virtual void machine_start(); + UINT32 screen_update_tumblep(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/tumblep.c -----------*/ -SCREEN_UPDATE_IND16( tumblep ); + diff --git a/src/mame/includes/tunhunt.h b/src/mame/includes/tunhunt.h index b8ab9f1108e..def2f16c199 100644 --- a/src/mame/includes/tunhunt.h +++ b/src/mame/includes/tunhunt.h @@ -24,6 +24,7 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_tunhunt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -32,4 +33,4 @@ public: -SCREEN_UPDATE_IND16( tunhunt ); + diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h index 1b7d143407d..6519af93888 100644 --- a/src/mame/includes/turbo.h +++ b/src/mame/includes/turbo.h @@ -128,6 +128,9 @@ public: DECLARE_MACHINE_RESET(buckrog); DECLARE_VIDEO_START(buckrog); DECLARE_PALETTE_INIT(buckrog); + UINT32 screen_update_turbo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_subroc3d(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_buckrog(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -153,12 +156,12 @@ DECLARE_WRITE8_DEVICE_HANDLER( buckrog_sound_b_w ); -SCREEN_UPDATE_IND16( turbo ); -SCREEN_UPDATE_IND16( subroc3d ); -SCREEN_UPDATE_IND16( buckrog ); + + + diff --git a/src/mame/includes/tutankhm.h b/src/mame/includes/tutankhm.h index 7a9d6d8cd60..c826e72db71 100644 --- a/src/mame/includes/tutankhm.h +++ b/src/mame/includes/tutankhm.h @@ -31,10 +31,11 @@ public: DECLARE_WRITE8_MEMBER(tutankhm_flip_screen_y_w); DECLARE_MACHINE_START(tutankhm); DECLARE_MACHINE_RESET(tutankhm); + UINT32 screen_update_tutankhm(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/tutankhm.c -----------*/ -SCREEN_UPDATE_RGB32( tutankhm ); + diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h index ed6b4bb061a..feb9df74d4f 100644 --- a/src/mame/includes/twin16.h +++ b/src/mame/includes/twin16.h @@ -61,6 +61,8 @@ public: DECLARE_MACHINE_START(twin16); DECLARE_MACHINE_RESET(twin16); DECLARE_VIDEO_START(twin16); + UINT32 screen_update_twin16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_twin16(screen_device &screen, bool state); }; @@ -73,7 +75,7 @@ int twin16_spriteram_process_enable( running_machine &machine ); -SCREEN_UPDATE_IND16( twin16 ); -SCREEN_VBLANK( twin16 ); + + void twin16_spriteram_process( running_machine &machine ); diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h index a9ee1688bc8..192d3f8cfe0 100644 --- a/src/mame/includes/twincobr.h +++ b/src/mame/includes/twincobr.h @@ -104,6 +104,7 @@ public: DECLARE_MACHINE_RESET(twincobr); DECLARE_VIDEO_START(toaplan0); DECLARE_MACHINE_RESET(wardner); + UINT32 screen_update_toaplan0(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -126,4 +127,4 @@ extern void twincobr_flipscreen(running_machine &machine, int flip); extern void twincobr_display(running_machine &machine, int enable); -SCREEN_UPDATE_IND16( toaplan0 ); + diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h index 8d5f645d7fc..c0d23a52636 100644 --- a/src/mame/includes/tx1.h +++ b/src/mame/includes/tx1.h @@ -168,6 +168,15 @@ public: DECLARE_VIDEO_START(buggyboy); DECLARE_PALETTE_INIT(buggyboy); DECLARE_VIDEO_START(buggybjr); + UINT32 screen_update_tx1_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_tx1_middle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_tx1_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_buggyboy_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_buggyboy_middle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_buggyboy_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_buggybjr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_tx1(screen_device &screen, bool state); + void screen_eof_buggyboy(screen_device &screen, bool state); }; @@ -237,17 +246,17 @@ extern const device_type BUGGYBOY; -SCREEN_UPDATE_IND16( tx1_left ); -SCREEN_UPDATE_IND16( tx1_middle ); -SCREEN_UPDATE_IND16( tx1_right ); -SCREEN_VBLANK( tx1 ); -SCREEN_UPDATE_IND16( buggyboy_left ); -SCREEN_UPDATE_IND16( buggyboy_middle ); -SCREEN_UPDATE_IND16( buggyboy_right ); -SCREEN_VBLANK( buggyboy ); -SCREEN_UPDATE_IND16( buggybjr ); + + + + + + + + + diff --git a/src/mame/includes/ultraman.h b/src/mame/includes/ultraman.h index 495bde95ee3..a9e66f96619 100644 --- a/src/mame/includes/ultraman.h +++ b/src/mame/includes/ultraman.h @@ -33,6 +33,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_ultraman(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -46,4 +47,4 @@ extern void ultraman_zoom_callback_2(running_machine &machine, int *code,int *co -SCREEN_UPDATE_IND16( ultraman ); + diff --git a/src/mame/includes/ultratnk.h b/src/mame/includes/ultratnk.h index d6caca2243a..e080fefc2d0 100644 --- a/src/mame/includes/ultratnk.h +++ b/src/mame/includes/ultratnk.h @@ -39,6 +39,8 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_ultratnk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_ultratnk(screen_device &screen, bool state); }; @@ -46,6 +48,6 @@ public: -SCREEN_UPDATE_IND16( ultratnk ); -SCREEN_VBLANK( ultratnk ); + + diff --git a/src/mame/includes/undrfire.h b/src/mame/includes/undrfire.h index 0bea56867a9..fea17d77108 100644 --- a/src/mame/includes/undrfire.h +++ b/src/mame/includes/undrfire.h @@ -43,11 +43,13 @@ public: DECLARE_DRIVER_INIT(undrfire); DECLARE_DRIVER_INIT(cbombers); virtual void video_start(); + UINT32 screen_update_undrfire(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_cbombers(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/undrfire.c -----------*/ -SCREEN_UPDATE_IND16( undrfire ); -SCREEN_UPDATE_IND16( cbombers ); + + diff --git a/src/mame/includes/unico.h b/src/mame/includes/unico.h index f37d0ece0ab..46623d10673 100644 --- a/src/mame/includes/unico.h +++ b/src/mame/includes/unico.h @@ -40,6 +40,8 @@ public: DECLARE_VIDEO_START(unico); DECLARE_MACHINE_RESET(zeropt); DECLARE_VIDEO_START(zeropnt2); + UINT32 screen_update_unico(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_zeropnt2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -48,8 +50,8 @@ public: -SCREEN_UPDATE_IND16( unico ); -SCREEN_UPDATE_IND16( zeropnt2 ); + + diff --git a/src/mame/includes/usgames.h b/src/mame/includes/usgames.h index 36cbc34c3a2..c6dd4b3a057 100644 --- a/src/mame/includes/usgames.h +++ b/src/mame/includes/usgames.h @@ -17,6 +17,7 @@ public: TILE_GET_INFO_MEMBER(get_usgames_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_usgames(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -24,4 +25,4 @@ public: -SCREEN_UPDATE_IND16( usgames ); + diff --git a/src/mame/includes/vaportra.h b/src/mame/includes/vaportra.h index ade3f583c82..ae4b4a96407 100644 --- a/src/mame/includes/vaportra.h +++ b/src/mame/includes/vaportra.h @@ -37,6 +37,7 @@ public: DECLARE_DRIVER_INIT(vaportra); virtual void machine_start(); virtual void machine_reset(); + UINT32 screen_update_vaportra(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -44,4 +45,4 @@ public: /*----------- defined in video/vaportra.c -----------*/ -SCREEN_UPDATE_IND16( vaportra ); + diff --git a/src/mame/includes/vastar.h b/src/mame/includes/vastar.h index 4e94dfabf7c..4bdc468cbf3 100644 --- a/src/mame/includes/vastar.h +++ b/src/mame/includes/vastar.h @@ -46,6 +46,7 @@ public: TILE_GET_INFO_MEMBER(get_bg2_tile_info); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_vastar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -53,4 +54,4 @@ public: -SCREEN_UPDATE_IND16( vastar ); + diff --git a/src/mame/includes/vball.h b/src/mame/includes/vball.h index 4b40c572fb5..d7bd36eabf2 100644 --- a/src/mame/includes/vball.h +++ b/src/mame/includes/vball.h @@ -31,13 +31,14 @@ public: TILEMAP_MAPPER_MEMBER(background_scan); TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); + UINT32 screen_update_vb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/vball.c -----------*/ -SCREEN_UPDATE_IND16( vb ); + void vb_bgprombank_w(running_machine &machine, int bank); void vb_spprombank_w(running_machine &machine, int bank); void vb_mark_all_dirty(running_machine &machine); diff --git a/src/mame/includes/vectrex.h b/src/mame/includes/vectrex.h index e2281d17836..58ffef7a386 100644 --- a/src/mame/includes/vectrex.h +++ b/src/mame/includes/vectrex.h @@ -69,6 +69,7 @@ public: DECLARE_DRIVER_INIT(vectrex); virtual void video_start(); DECLARE_VIDEO_START(raaspec); + UINT32 screen_update_vectrex(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -94,7 +95,7 @@ extern const via6522_interface vectrex_via6522_interface; extern const via6522_interface spectrum1_via6522_interface; -SCREEN_UPDATE_RGB32( vectrex ); + diff --git a/src/mame/includes/vendetta.h b/src/mame/includes/vendetta.h index 934309599cc..55409021f98 100644 --- a/src/mame/includes/vendetta.h +++ b/src/mame/includes/vendetta.h @@ -43,6 +43,7 @@ public: DECLARE_DRIVER_INIT(esckids); virtual void machine_start(); virtual void machine_reset(); + UINT32 screen_update_vendetta(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/vendetta.c -----------*/ @@ -51,4 +52,4 @@ extern void vendetta_tile_callback(running_machine &machine, int layer,int bank, extern void esckids_tile_callback(running_machine &machine, int layer,int bank,int *code,int *color,int *flags,int *priority); extern void vendetta_sprite_callback(running_machine &machine, int *code,int *color,int *priority_mask); -SCREEN_UPDATE_IND16( vendetta ); + diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h index 58fa770f641..8f74c93dc1a 100644 --- a/src/mame/includes/vicdual.h +++ b/src/mame/includes/vicdual.h @@ -75,6 +75,9 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(samurai_protection_r); DECLARE_INPUT_CHANGED_MEMBER(coin_changed); DECLARE_MACHINE_START(frogs_audio); + UINT32 screen_update_vicdual_bw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_vicdual_bw_or_color(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_vicdual_color(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -86,9 +89,9 @@ int vicdual_is_cabinet_color(running_machine &machine); /*----------- defined in video/vicdual.c -----------*/ -SCREEN_UPDATE_RGB32( vicdual_bw ); -SCREEN_UPDATE_RGB32( vicdual_color ); -SCREEN_UPDATE_RGB32( vicdual_bw_or_color ); + + + /*----------- defined in audio/vicdual.c -----------*/ diff --git a/src/mame/includes/victory.h b/src/mame/includes/victory.h index 041fe04b501..90fd72f35be 100644 --- a/src/mame/includes/victory.h +++ b/src/mame/includes/victory.h @@ -61,12 +61,13 @@ public: DECLARE_READ8_MEMBER(victory_video_control_r); DECLARE_WRITE8_MEMBER(victory_video_control_w); virtual void video_start(); + UINT32 screen_update_victory(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/victory.c -----------*/ -SCREEN_UPDATE_IND16( victory ); + INTERRUPT_GEN( victory_vblank_interrupt ); diff --git a/src/mame/includes/videopin.h b/src/mame/includes/videopin.h index 2970e5b2efb..4bc41843728 100644 --- a/src/mame/includes/videopin.h +++ b/src/mame/includes/videopin.h @@ -41,6 +41,7 @@ public: TILE_GET_INFO_MEMBER(get_tile_info); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_videopin(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -53,5 +54,5 @@ DISCRETE_SOUND_EXTERN( videopin ); -SCREEN_UPDATE_IND16( videopin ); + diff --git a/src/mame/includes/vigilant.h b/src/mame/includes/vigilant.h index b9baa56bab5..3cf5aa51574 100644 --- a/src/mame/includes/vigilant.h +++ b/src/mame/includes/vigilant.h @@ -26,6 +26,8 @@ public: DECLARE_WRITE8_MEMBER(vigilant_rear_color_w); virtual void video_start(); virtual void video_reset(); + UINT32 screen_update_vigilant(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_kikcubic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -33,5 +35,5 @@ public: -SCREEN_UPDATE_IND16( vigilant ); -SCREEN_UPDATE_IND16( kikcubic ); + + diff --git a/src/mame/includes/vindictr.h b/src/mame/includes/vindictr.h index f41d9de3986..b09fc97cb2e 100644 --- a/src/mame/includes/vindictr.h +++ b/src/mame/includes/vindictr.h @@ -22,6 +22,7 @@ public: DECLARE_MACHINE_START(vindictr); DECLARE_MACHINE_RESET(vindictr); DECLARE_VIDEO_START(vindictr); + UINT32 screen_update_vindictr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -30,6 +31,6 @@ public: DECLARE_WRITE16_HANDLER( vindictr_paletteram_w ); -SCREEN_UPDATE_IND16( vindictr ); + void vindictr_scanline_update(screen_device &screen, int scanline); diff --git a/src/mame/includes/volfied.h b/src/mame/includes/volfied.h index ebad428220c..0fd40b4c5f7 100644 --- a/src/mame/includes/volfied.h +++ b/src/mame/includes/volfied.h @@ -43,6 +43,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_volfied(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -57,5 +58,5 @@ void volfied_cchip_reset(running_machine &machine); -SCREEN_UPDATE_IND16( volfied ); + diff --git a/src/mame/includes/vsnes.h b/src/mame/includes/vsnes.h index 2c03d5477f9..24215222ac6 100644 --- a/src/mame/includes/vsnes.h +++ b/src/mame/includes/vsnes.h @@ -111,6 +111,10 @@ SCREEN_UPDATE_IND16( vsnes ); SCREEN_UPDATE_IND16( vsnes_bottom ); + + + + extern const ppu2c0x_interface vsnes_ppu_interface_1; extern const ppu2c0x_interface vsnes_ppu_interface_2; diff --git a/src/mame/includes/vulgus.h b/src/mame/includes/vulgus.h index c414aa754c3..d7ffcd7ee53 100644 --- a/src/mame/includes/vulgus.h +++ b/src/mame/includes/vulgus.h @@ -25,6 +25,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_vulgus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -33,4 +34,4 @@ public: -SCREEN_UPDATE_IND16( vulgus ); + diff --git a/src/mame/includes/warpwarp.h b/src/mame/includes/warpwarp.h index 8c43b3c37d2..0887aff2738 100644 --- a/src/mame/includes/warpwarp.h +++ b/src/mame/includes/warpwarp.h @@ -46,6 +46,7 @@ public: DECLARE_PALETTE_INIT(warpwarp); DECLARE_VIDEO_START(navarone); DECLARE_PALETTE_INIT(navarone); + UINT32 screen_update_geebee(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -57,7 +58,7 @@ public: -SCREEN_UPDATE_IND16( geebee ); + /*----------- defined in audio/geebee.c -----------*/ diff --git a/src/mame/includes/warriorb.h b/src/mame/includes/warriorb.h index 7d29ec141b0..1c49cf04d0c 100644 --- a/src/mame/includes/warriorb.h +++ b/src/mame/includes/warriorb.h @@ -38,11 +38,13 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_warriorb_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_warriorb_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/warriorb.c -----------*/ -SCREEN_UPDATE_IND16( warriorb_left ); -SCREEN_UPDATE_IND16( warriorb_right ); + + diff --git a/src/mame/includes/wc90.h b/src/mame/includes/wc90.h index 8565c5e14cf..4abdc31a256 100644 --- a/src/mame/includes/wc90.h +++ b/src/mame/includes/wc90.h @@ -52,6 +52,7 @@ public: TILE_GET_INFO_MEMBER(track_get_fg_tile_info); virtual void video_start(); DECLARE_VIDEO_START(wc90t); + UINT32 screen_update_wc90(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -59,4 +60,4 @@ public: -SCREEN_UPDATE_IND16( wc90 ); + diff --git a/src/mame/includes/wc90b.h b/src/mame/includes/wc90b.h index 986588dbeb8..8d15feba650 100644 --- a/src/mame/includes/wc90b.h +++ b/src/mame/includes/wc90b.h @@ -39,11 +39,12 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_tx_tile_info); virtual void video_start(); + UINT32 screen_update_wc90b(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/wc90b.c -----------*/ -SCREEN_UPDATE_IND16( wc90b ); + diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h index bf684e6ac68..84a4a069e4e 100644 --- a/src/mame/includes/wecleman.h +++ b/src/mame/includes/wecleman.h @@ -76,14 +76,16 @@ public: DECLARE_VIDEO_START(wecleman); DECLARE_MACHINE_RESET(hotchase); DECLARE_VIDEO_START(hotchase); + UINT32 screen_update_wecleman(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_hotchase(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/wecleman.c -----------*/ -SCREEN_UPDATE_RGB32( wecleman ); -SCREEN_UPDATE_IND16( hotchase ); + + void hotchase_zoom_callback_0(running_machine &machine, int *code,int *color,int *flags); diff --git a/src/mame/includes/welltris.h b/src/mame/includes/welltris.h index b026f9bb6b1..e283aaf3cb9 100644 --- a/src/mame/includes/welltris.h +++ b/src/mame/includes/welltris.h @@ -35,6 +35,7 @@ public: DECLARE_DRIVER_INIT(welltris); TILE_GET_INFO_MEMBER(get_welltris_tile_info); virtual void video_start(); + UINT32 screen_update_welltris(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -42,4 +43,4 @@ public: -SCREEN_UPDATE_IND16( welltris ); + diff --git a/src/mame/includes/wgp.h b/src/mame/includes/wgp.h index 4d6703a6f4a..62d7cf51f95 100644 --- a/src/mame/includes/wgp.h +++ b/src/mame/includes/wgp.h @@ -68,6 +68,7 @@ public: virtual void machine_reset(); virtual void video_start(); DECLARE_VIDEO_START(wgp2); + UINT32 screen_update_wgp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -77,4 +78,4 @@ public: -SCREEN_UPDATE_IND16( wgp ); + diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h index 6ad5d484f30..5c63b77d732 100644 --- a/src/mame/includes/williams.h +++ b/src/mame/includes/williams.h @@ -104,6 +104,9 @@ public: DECLARE_VIDEO_START(blaster); DECLARE_MACHINE_START(williams_common); DECLARE_MACHINE_RESET(williams_common); + UINT32 screen_update_williams(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_williams2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_blaster(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -195,8 +198,8 @@ TIMER_DEVICE_CALLBACK( williams2_endscreen_callback ); -SCREEN_UPDATE_RGB32( williams ); -SCREEN_UPDATE_RGB32( blaster ); -SCREEN_UPDATE_RGB32( williams2 ); + + + diff --git a/src/mame/includes/wiping.h b/src/mame/includes/wiping.h index 53ebc05980a..309cd4373f3 100644 --- a/src/mame/includes/wiping.h +++ b/src/mame/includes/wiping.h @@ -21,11 +21,12 @@ public: DECLARE_WRITE8_MEMBER(sound_irq_mask_w); DECLARE_WRITE8_MEMBER(wiping_flipscreen_w); virtual void palette_init(); + UINT32 screen_update_wiping(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/wiping.c -----------*/ -SCREEN_UPDATE_IND16( wiping ); + diff --git a/src/mame/includes/wiz.h b/src/mame/includes/wiz.h index e9917a196c2..0c91d14c62b 100644 --- a/src/mame/includes/wiz.h +++ b/src/mame/includes/wiz.h @@ -48,6 +48,9 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_wiz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_stinger(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_kungfut(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -56,6 +59,6 @@ public: -SCREEN_UPDATE_IND16( wiz ); -SCREEN_UPDATE_IND16( stinger ); -SCREEN_UPDATE_IND16( kungfut ); + + + diff --git a/src/mame/includes/wolfpack.h b/src/mame/includes/wolfpack.h index 53c0507c40a..8edfbbcd0ba 100644 --- a/src/mame/includes/wolfpack.h +++ b/src/mame/includes/wolfpack.h @@ -54,13 +54,15 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_wolfpack(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_wolfpack(screen_device &screen, bool state); }; /*----------- defined in video/wolfpack.c -----------*/ -SCREEN_UPDATE_IND16( wolfpack ); -SCREEN_VBLANK( wolfpack ); + + diff --git a/src/mame/includes/wrally.h b/src/mame/includes/wrally.h index 4d25c00ef16..51e4fbe29ab 100644 --- a/src/mame/includes/wrally.h +++ b/src/mame/includes/wrally.h @@ -24,6 +24,7 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_wrally_screen0); TILE_GET_INFO_MEMBER(get_tile_info_wrally_screen1); virtual void video_start(); + UINT32 screen_update_wrally(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -33,5 +34,5 @@ public: /*----------- defined in video/wrally.c -----------*/ -SCREEN_UPDATE_IND16( wrally ); + diff --git a/src/mame/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h index 9124a128968..1063dec7501 100644 --- a/src/mame/includes/wwfsstar.h +++ b/src/mame/includes/wwfsstar.h @@ -26,10 +26,11 @@ public: TILEMAP_MAPPER_MEMBER(bg0_scan); TILE_GET_INFO_MEMBER(get_bg0_tile_info); virtual void video_start(); + UINT32 screen_update_wwfsstar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/wwfsstar.c -----------*/ -SCREEN_UPDATE_IND16( wwfsstar ); + diff --git a/src/mame/includes/wwfwfest.h b/src/mame/includes/wwfwfest.h index dd64cf1ad8a..9accc1ef793 100644 --- a/src/mame/includes/wwfwfest.h +++ b/src/mame/includes/wwfwfest.h @@ -43,6 +43,7 @@ public: TILE_GET_INFO_MEMBER(get_bg1_tile_info); virtual void video_start(); DECLARE_VIDEO_START(wwfwfstb); + UINT32 screen_update_wwfwfest(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -50,4 +51,4 @@ public: -SCREEN_UPDATE_IND16( wwfwfest ); + diff --git a/src/mame/includes/xain.h b/src/mame/includes/xain.h index c8ebdc53cdc..9e0d6ff6af3 100644 --- a/src/mame/includes/xain.h +++ b/src/mame/includes/xain.h @@ -68,10 +68,11 @@ public: TILE_GET_INFO_MEMBER(get_char_tile_info); virtual void machine_start(); virtual void video_start(); + UINT32 screen_update_xain(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/xain.c -----------*/ -SCREEN_UPDATE_IND16( xain ); + diff --git a/src/mame/includes/xexex.h b/src/mame/includes/xexex.h index a0424b07513..5e1c7a2a7ba 100644 --- a/src/mame/includes/xexex.h +++ b/src/mame/includes/xexex.h @@ -64,6 +64,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_xexex(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -73,4 +74,4 @@ extern void xexex_sprite_callback(running_machine &machine, int *code, int *colo extern void xexex_tile_callback(running_machine &machine, int layer, int *code, int *color, int *flags); -SCREEN_UPDATE_RGB32( xexex ); + diff --git a/src/mame/includes/xmen.h b/src/mame/includes/xmen.h index 92e79176be9..0ecef1390a9 100644 --- a/src/mame/includes/xmen.h +++ b/src/mame/includes/xmen.h @@ -49,6 +49,10 @@ public: virtual void machine_start(); virtual void machine_reset(); DECLARE_VIDEO_START(xmen6p); + UINT32 screen_update_xmen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_xmen6p_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_xmen6p_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_eof_xmen6p(screen_device &screen, bool state); }; /*----------- defined in video/xmen.c -----------*/ @@ -57,7 +61,7 @@ void xmen_tile_callback(running_machine &machine, int layer,int bank,int *code,i void xmen_sprite_callback(running_machine &machine, int *code,int *color,int *priority_mask); -SCREEN_UPDATE_IND16( xmen ); -SCREEN_UPDATE_IND16( xmen6p_left ); -SCREEN_UPDATE_IND16( xmen6p_right ); -SCREEN_VBLANK( xmen6p ); + + + + diff --git a/src/mame/includes/xorworld.h b/src/mame/includes/xorworld.h index 9b12ef2756b..12d4e67d6ce 100644 --- a/src/mame/includes/xorworld.h +++ b/src/mame/includes/xorworld.h @@ -19,6 +19,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_xorworld(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -27,4 +28,4 @@ public: -SCREEN_UPDATE_IND16( xorworld ); + diff --git a/src/mame/includes/xxmissio.h b/src/mame/includes/xxmissio.h index 5e7adf9689a..43085134350 100644 --- a/src/mame/includes/xxmissio.h +++ b/src/mame/includes/xxmissio.h @@ -28,13 +28,14 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); virtual void machine_start(); virtual void video_start(); + UINT32 screen_update_xxmissio(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/xxmissio.c -----------*/ -SCREEN_UPDATE_IND16( xxmissio ); + DECLARE_WRITE8_DEVICE_HANDLER( xxmissio_scroll_x_w ); DECLARE_WRITE8_DEVICE_HANDLER( xxmissio_scroll_y_w ); diff --git a/src/mame/includes/xybots.h b/src/mame/includes/xybots.h index e81bb6a7926..5864d5aa8b9 100644 --- a/src/mame/includes/xybots.h +++ b/src/mame/includes/xybots.h @@ -20,10 +20,11 @@ public: DECLARE_MACHINE_START(xybots); DECLARE_MACHINE_RESET(xybots); DECLARE_VIDEO_START(xybots); + UINT32 screen_update_xybots(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; /*----------- defined in video/xybots.c -----------*/ -SCREEN_UPDATE_IND16( xybots ); + diff --git a/src/mame/includes/xyonix.h b/src/mame/includes/xyonix.h index d55177f34d8..5e46c152b94 100644 --- a/src/mame/includes/xyonix.h +++ b/src/mame/includes/xyonix.h @@ -19,6 +19,7 @@ public: TILE_GET_INFO_MEMBER(get_xyonix_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_xyonix(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -26,4 +27,4 @@ public: -SCREEN_UPDATE_IND16(xyonix); + diff --git a/src/mame/includes/yiear.h b/src/mame/includes/yiear.h index c64efbd960e..8f698e04abe 100644 --- a/src/mame/includes/yiear.h +++ b/src/mame/includes/yiear.h @@ -35,6 +35,7 @@ public: virtual void machine_reset(); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_yiear(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -43,4 +44,4 @@ public: -SCREEN_UPDATE_IND16( yiear ); + diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h index 38ec8242d7d..db69bbb7843 100644 --- a/src/mame/includes/yunsun16.h +++ b/src/mame/includes/yunsun16.h @@ -44,6 +44,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_yunsun16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -51,4 +52,4 @@ public: -SCREEN_UPDATE_IND16( yunsun16 ); + diff --git a/src/mame/includes/yunsung8.h b/src/mame/includes/yunsung8.h index 316780e6f51..a6683d5a854 100644 --- a/src/mame/includes/yunsung8.h +++ b/src/mame/includes/yunsung8.h @@ -39,6 +39,7 @@ public: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); + UINT32 screen_update_yunsung8(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -46,4 +47,4 @@ public: -SCREEN_UPDATE_IND16( yunsung8 ); + diff --git a/src/mame/includes/zac2650.h b/src/mame/includes/zac2650.h index 841290e8367..f7a4235a232 100644 --- a/src/mame/includes/zac2650.h +++ b/src/mame/includes/zac2650.h @@ -21,6 +21,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_tinvader(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -28,5 +29,5 @@ public: -SCREEN_UPDATE_IND16( tinvader ); + diff --git a/src/mame/includes/zaccaria.h b/src/mame/includes/zaccaria.h index e4c0478555c..394d72ed329 100644 --- a/src/mame/includes/zaccaria.h +++ b/src/mame/includes/zaccaria.h @@ -44,6 +44,7 @@ public: TILE_GET_INFO_MEMBER(get_tile_info); virtual void video_start(); virtual void palette_init(); + UINT32 screen_update_zaccaria(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -51,4 +52,4 @@ public: -SCREEN_UPDATE_IND16( zaccaria ); + diff --git a/src/mame/includes/zaxxon.h b/src/mame/includes/zaxxon.h index 7169fc659b8..c02e8c6daf3 100644 --- a/src/mame/includes/zaxxon.h +++ b/src/mame/includes/zaxxon.h @@ -68,6 +68,10 @@ public: virtual void palette_init(); DECLARE_VIDEO_START(razmataz); DECLARE_VIDEO_START(congo); + UINT32 screen_update_zaxxon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_futspy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_razmataz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_congo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -95,7 +99,7 @@ MACHINE_CONFIG_EXTERN( congo_samples ); -SCREEN_UPDATE_IND16( zaxxon ); -SCREEN_UPDATE_IND16( razmataz ); -SCREEN_UPDATE_IND16( congo ); -SCREEN_UPDATE_IND16( futspy ); + + + + |