From 41d4cd4f6ab11525a31620595e0fe2dd051d90d9 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 18 Sep 2012 08:56:11 +0000 Subject: [PATCH] clean some newly introduce macros since, calls already have full names (no whatsnew) --- src/emu/screen.h | 2 -- src/mame/drivers/jollyjgr.c | 2 +- src/mame/machine/slikshot.c | 2 +- src/mame/video/cinemat.c | 2 +- src/mame/video/dynax.c | 2 +- src/mame/video/kaneko16.c | 4 ++-- src/mame/video/m62.c | 2 +- src/mame/video/playch10.c | 4 ++-- src/mame/video/seta.c | 6 +++--- src/mame/video/ssv.c | 4 ++-- src/mame/video/taitojc.c | 2 +- src/mame/video/tceptor.c | 4 ++-- src/mame/video/tmnt.c | 2 +- src/mame/video/toaplan2.c | 10 ++++------ src/mame/video/vicdual.c | 4 ++-- src/mess/video/mz700.c | 2 +- 16 files changed, 25 insertions(+), 29 deletions(-) diff --git a/src/emu/screen.h b/src/emu/screen.h index 76e5c77ed5b..c89f227c1b7 100644 --- a/src/emu/screen.h +++ b/src/emu/screen.h @@ -352,8 +352,6 @@ typedef device_type_iterator<&device_creator, screen_device> scre #define SCREEN_UPDATE_RGB32(name) UINT32 SCREEN_UPDATE_NAME(name)(device_t *, screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) #define SCREEN_UPDATE16_CALL(name) SCREEN_UPDATE_NAME(name)(NULL, screen, bitmap, cliprect) #define SCREEN_UPDATE32_CALL(name) SCREEN_UPDATE_NAME(name)(NULL, screen, bitmap, cliprect) -#define SCREEN_UPDATE16_CALL_MEMBER(name) SCREEN_UPDATE_NAME(name)(screen, bitmap, cliprect) -#define SCREEN_UPDATE32_CALL_MEMBER(name) SCREEN_UPDATE_NAME(name)(screen, bitmap, cliprect) #define SCREEN_VBLANK_NAME(name) screen_vblank_##name #define SCREEN_VBLANK(name) void SCREEN_VBLANK_NAME(name)(device_t *, screen_device &screen, bool vblank_on) diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c index 83fd0c3af6c..ce3c79ab415 100644 --- a/src/mame/drivers/jollyjgr.c +++ b/src/mame/drivers/jollyjgr.c @@ -553,7 +553,7 @@ UINT32 jollyjgr_state::screen_update_fspider(screen_device &screen, bitmap_ind16 { // Draw bg and sprites - SCREEN_UPDATE16_CALL_MEMBER(jollyjgr); + screen_update_jollyjgr(screen, bitmap, cliprect); /* Draw bullets 16 bytes, 2 bytes per bullet (y,x). 2 player bullets, 6 enemy bullets. diff --git a/src/mame/machine/slikshot.c b/src/mame/machine/slikshot.c index 87322a32435..d84392709e8 100644 --- a/src/mame/machine/slikshot.c +++ b/src/mame/machine/slikshot.c @@ -554,7 +554,7 @@ UINT32 itech8_state::screen_update_slikshot(screen_device &screen, bitmap_rgb32 int temp, i; /* draw the normal video first */ - SCREEN_UPDATE32_CALL_MEMBER(itech8_2page); + screen_update_itech8_2page(screen, bitmap, cliprect); /* add the current X,Y positions to the list */ m_xbuffer[m_ybuffer_next % YBUFFER_COUNT] = ioport("FAKEX")->read_safe(0); diff --git a/src/mame/video/cinemat.c b/src/mame/video/cinemat.c index ad18571bca5..77209605402 100644 --- a/src/mame/video/cinemat.c +++ b/src/mame/video/cinemat.c @@ -229,7 +229,7 @@ UINT32 cinemat_state::screen_update_spacewar(screen_device &screen, bitmap_rgb32 { int sw_option = machine().root_device().ioport("INPUTS")->read(); - SCREEN_UPDATE32_CALL_MEMBER(cinemat); + screen_update_cinemat(screen, bitmap, cliprect); /* set the state of the artwork */ output_set_value("pressed3", (~sw_option >> 0) & 1); diff --git a/src/mame/video/dynax.c b/src/mame/video/dynax.c index b2ad4ce364b..b3ce121f6a8 100644 --- a/src/mame/video/dynax.c +++ b/src/mame/video/dynax.c @@ -1404,5 +1404,5 @@ UINT32 dynax_state::screen_update_htengoku(screen_device &screen, bitmap_ind16 & m_ddenlovr_pixmap[3 - layer][y * 512 + x] = (UINT8)(bitmap.pix16(y, x)); } - return SCREEN_UPDATE16_CALL_MEMBER(ddenlovr); + return screen_update_ddenlovr(screen, bitmap, cliprect); } diff --git a/src/mame/video/kaneko16.c b/src/mame/video/kaneko16.c index 45b15a1cef4..44b165746de 100644 --- a/src/mame/video/kaneko16.c +++ b/src/mame/video/kaneko16.c @@ -73,7 +73,7 @@ UINT32 kaneko16_state::screen_update_kaneko16(screen_device &screen, bitmap_ind1 // if the display is disabled, do nothing? if (!m_disp_enable) return 0; - SCREEN_UPDATE16_CALL_MEMBER(common); + screen_update_common(screen, bitmap, cliprect); m_kaneko_spr->kaneko16_render_sprites(machine(),bitmap,cliprect, m_spriteram, m_spriteram.bytes()); return 0; } @@ -197,7 +197,7 @@ UINT32 kaneko16_berlwall_state::screen_update_berlwall(screen_device &screen, bi // if the display is disabled, do nothing? if (!m_disp_enable) return 0; - SCREEN_UPDATE16_CALL_MEMBER(common); + screen_update_common(screen, bitmap, cliprect); m_kaneko_spr->kaneko16_render_sprites(machine(),bitmap,cliprect, m_spriteram, m_spriteram.bytes()); return 0; } diff --git a/src/mame/video/m62.c b/src/mame/video/m62.c index 2e7fc535a81..21d5a70f6fe 100644 --- a/src/mame/video/m62.c +++ b/src/mame/video/m62.c @@ -555,7 +555,7 @@ WRITE8_MEMBER(m62_state::ldrun3_topbottom_mask_w) UINT32 m62_state::screen_update_ldrun3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - SCREEN_UPDATE16_CALL_MEMBER(ldrun); + screen_update_ldrun(screen, bitmap, cliprect); if (m_ldrun3_topbottom_mask) { diff --git a/src/mame/video/playch10.c b/src/mame/video/playch10.c index d242c4b39c1..dcf988b6aa5 100644 --- a/src/mame/video/playch10.c +++ b/src/mame/video/playch10.c @@ -147,7 +147,7 @@ UINT32 playch10_state::screen_update_playch10_top(screen_device &screen, bitmap_ /* Single Monitor version */ if (m_pc10_bios != 1) - return SCREEN_UPDATE16_CALL_MEMBER(playch10_single); + return screen_update_playch10_single(screen, bitmap, cliprect); if (!m_pc10_dispmask) /* render the ppu */ @@ -163,7 +163,7 @@ UINT32 playch10_state::screen_update_playch10_bottom(screen_device &screen, bitm /* Single Monitor version */ if (m_pc10_bios != 1) - return SCREEN_UPDATE16_CALL_MEMBER(playch10_single); + return screen_update_playch10_single(screen, bitmap, cliprect); /* When the bios is accessing vram, the video circuitry can't access it */ diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c index b83405f5b1f..44c426d90f2 100644 --- a/src/mame/video/seta.c +++ b/src/mame/video/seta.c @@ -1073,19 +1073,19 @@ void seta_state::screen_eof_setaroul(screen_device &screen, bool state) UINT32 seta_state::screen_update_seta(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { set_pens(machine()); - return SCREEN_UPDATE16_CALL_MEMBER(seta_layers); + return screen_update_seta_layers(screen, bitmap, cliprect); } UINT32 seta_state::screen_update_usclssic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { usclssic_set_pens(machine()); - return SCREEN_UPDATE16_CALL_MEMBER(seta_layers); + return screen_update_seta_layers(screen, bitmap, cliprect); } UINT32 seta_state::screen_update_inttoote(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { /* no palette to set */ - return SCREEN_UPDATE16_CALL_MEMBER(seta_layers); + return screen_update_seta_layers(screen, bitmap, cliprect); } diff --git a/src/mame/video/ssv.c b/src/mame/video/ssv.c index 8b5ca49bba4..b2c67a45dd1 100644 --- a/src/mame/video/ssv.c +++ b/src/mame/video/ssv.c @@ -972,13 +972,13 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r UINT32 ssv_state::screen_update_eaglshot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - return SCREEN_UPDATE16_CALL_MEMBER(ssv); + return screen_update_ssv(screen, bitmap, cliprect); } UINT32 ssv_state::screen_update_gdfs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - SCREEN_UPDATE16_CALL_MEMBER(ssv); + screen_update_ssv(screen, bitmap, cliprect); // draw zooming sprites m_gdfs_st0020->st0020_draw_all(machine(), bitmap, cliprect); diff --git a/src/mame/video/taitojc.c b/src/mame/video/taitojc.c index f3ae2dbf671..7be34fb039b 100644 --- a/src/mame/video/taitojc.c +++ b/src/mame/video/taitojc.c @@ -373,7 +373,7 @@ UINT32 taitojc_state::screen_update_dendego(screen_device &screen, bitmap_ind16 if (level != output_get_value("counter1")) output_set_value("counter1", level); - return SCREEN_UPDATE16_CALL_MEMBER(taitojc); + return screen_update_taitojc(screen, bitmap, cliprect); } diff --git a/src/mame/video/tceptor.c b/src/mame/video/tceptor.c index bfcdc9d4f6e..a65ee69d540 100644 --- a/src/mame/video/tceptor.c +++ b/src/mame/video/tceptor.c @@ -545,14 +545,14 @@ UINT32 tceptor_state::screen_update_tceptor_3d_left(screen_device &screen, bitma { if ((screen.frame_number() & 1) == 1) return UPDATE_HAS_NOT_CHANGED; - return SCREEN_UPDATE16_CALL_MEMBER( tceptor_2d ); + return screen_update_tceptor_2d(screen, bitmap, cliprect); } UINT32 tceptor_state::screen_update_tceptor_3d_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { if ((screen.frame_number() & 1) == 0) return UPDATE_HAS_NOT_CHANGED; - return SCREEN_UPDATE16_CALL_MEMBER( tceptor_2d ); + return screen_update_tceptor_2d(screen, bitmap, cliprect); } diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c index c7a8bc0c4d2..a86cf8c1bb5 100644 --- a/src/mame/video/tmnt.c +++ b/src/mame/video/tmnt.c @@ -760,7 +760,7 @@ UINT32 tmnt_state::screen_update_tmnt2(screen_device &screen, bitmap_ind16 &bitm palette_set_shadow_mode(machine(), 0); } - SCREEN_UPDATE16_CALL_MEMBER(lgtnfght); + screen_update_lgtnfght(screen, bitmap, cliprect); return 0; } diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c index 46c52a8c51c..e785a998288 100644 --- a/src/mame/video/toaplan2.c +++ b/src/mame/video/toaplan2.c @@ -422,8 +422,7 @@ UINT32 toaplan2_state::screen_update_toaplan2(screen_device &screen, bitmap_ind1 UINT32 toaplan2_state::screen_update_truxton2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - - SCREEN_UPDATE16_CALL_MEMBER(toaplan2); + screen_update_toaplan2(screen, bitmap, cliprect); m_tx_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -431,8 +430,7 @@ UINT32 toaplan2_state::screen_update_truxton2(screen_device &screen, bitmap_ind1 UINT32 toaplan2_state::screen_update_batrider(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - - SCREEN_UPDATE16_CALL_MEMBER( toaplan2 ); + screen_update_toaplan2(screen, bitmap, cliprect); int line; rectangle clip; @@ -462,13 +460,13 @@ UINT32 toaplan2_state::screen_update_batrider(screen_device &screen, bitmap_ind1 UINT32 toaplan2_state::screen_update_dogyuun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - SCREEN_UPDATE16_CALL_MEMBER( toaplan2_dual ); + screen_update_toaplan2_dual(screen, bitmap, cliprect); return 0; } UINT32 toaplan2_state::screen_update_batsugun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - SCREEN_UPDATE16_CALL_MEMBER( toaplan2_mixed ); + screen_update_toaplan2_mixed(screen, bitmap, cliprect); return 0; } diff --git a/src/mame/video/vicdual.c b/src/mame/video/vicdual.c index d03afc87f74..a47a6bca884 100644 --- a/src/mame/video/vicdual.c +++ b/src/mame/video/vicdual.c @@ -139,9 +139,9 @@ UINT32 vicdual_state::screen_update_vicdual_color(screen_device &screen, bitmap_ UINT32 vicdual_state::screen_update_vicdual_bw_or_color(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { if (vicdual_is_cabinet_color(machine())) - SCREEN_UPDATE32_CALL_MEMBER(vicdual_color); + screen_update_vicdual_color(screen, bitmap, cliprect); else - SCREEN_UPDATE32_CALL_MEMBER(vicdual_bw); + screen_update_vicdual_bw(screen, bitmap, cliprect); return 0; } diff --git a/src/mess/video/mz700.c b/src/mess/video/mz700.c index 00ee041cd32..4454ebdf1db 100644 --- a/src/mess/video/mz700.c +++ b/src/mess/video/mz700.c @@ -86,7 +86,7 @@ UINT32 mz_state::screen_update_mz800(screen_device &screen, bitmap_ind16 &bitmap bitmap.fill(get_black_pen(machine()), cliprect); if (m_mz700_mode) - return SCREEN_UPDATE16_CALL_MEMBER(mz700); + return screen_update_mz700(screen, bitmap, cliprect); else { if (m_hires_mode)