From 5ac4a7d9ba357e4a73a0f224963b4a2728e5e757 Mon Sep 17 00:00:00 2001 From: Fabio Priuli Date: Tue, 3 Jun 2014 14:10:12 +0000 Subject: [PATCH] macro naming clean up (was a copy&paste mistake from 30693). nw. --- src/mame/includes/asterix.h | 2 +- src/mame/includes/lethal.h | 2 +- src/mame/includes/parodius.h | 2 +- src/mame/includes/rollerg.h | 2 +- src/mame/includes/surpratk.h | 2 +- src/mame/includes/tmnt.h | 6 +++--- src/mame/video/asterix.c | 2 +- src/mame/video/k053244_k053245.h | 2 +- src/mame/video/lethal.c | 2 +- src/mame/video/parodius.c | 2 +- src/mame/video/rollerg.c | 2 +- src/mame/video/surpratk.c | 2 +- src/mame/video/tmnt.c | 6 +++--- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/mame/includes/asterix.h b/src/mame/includes/asterix.h index e525351e689..247bf6395fe 100644 --- a/src/mame/includes/asterix.h +++ b/src/mame/includes/asterix.h @@ -60,7 +60,7 @@ public: virtual void machine_reset(); UINT32 screen_update_asterix(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(asterix_interrupt); - MCFG_K05324X_CB_MEMBER(sprite_callback); + K05324X_CB_MEMBER(sprite_callback); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/lethal.h b/src/mame/includes/lethal.h index ded48c19930..77b473ca86c 100644 --- a/src/mame/includes/lethal.h +++ b/src/mame/includes/lethal.h @@ -52,7 +52,7 @@ public: virtual void video_start(); UINT32 screen_update_lethalen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(lethalen_interrupt); - MCFG_K05324X_CB_MEMBER(sprite_callback); + K05324X_CB_MEMBER(sprite_callback); }; /*----------- defined in video/lethal.c -----------*/ diff --git a/src/mame/includes/parodius.h b/src/mame/includes/parodius.h index 08c8f30feb0..1adb5d2e1a7 100644 --- a/src/mame/includes/parodius.h +++ b/src/mame/includes/parodius.h @@ -56,7 +56,7 @@ public: virtual void machine_reset(); UINT32 screen_update_parodius(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(parodius_interrupt); - MCFG_K05324X_CB_MEMBER(sprite_callback); + K05324X_CB_MEMBER(sprite_callback); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/rollerg.h b/src/mame/includes/rollerg.h index 5e03c71fd8c..1608e2f8934 100644 --- a/src/mame/includes/rollerg.h +++ b/src/mame/includes/rollerg.h @@ -55,7 +55,7 @@ public: virtual void machine_reset(); virtual void video_start(); UINT32 screen_update_rollerg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - MCFG_K05324X_CB_MEMBER(sprite_callback); + K05324X_CB_MEMBER(sprite_callback); K051316_CB_MEMBER(zoom_callback); protected: diff --git a/src/mame/includes/surpratk.h b/src/mame/includes/surpratk.h index 6f8ec68832b..500feaf5342 100644 --- a/src/mame/includes/surpratk.h +++ b/src/mame/includes/surpratk.h @@ -42,7 +42,7 @@ public: UINT32 screen_update_surpratk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(surpratk_interrupt); - MCFG_K05324X_CB_MEMBER(sprite_callback); + K05324X_CB_MEMBER(sprite_callback); }; /*----------- defined in video/surpratk.c -----------*/ diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h index 08a85c8f1bc..9634a89c389 100644 --- a/src/mame/includes/tmnt.h +++ b/src/mame/includes/tmnt.h @@ -169,9 +169,9 @@ public: inline UINT32 tmnt2_get_word( UINT32 addr ); void tmnt2_put_word( address_space &space, UINT32 addr, UINT16 data ); DECLARE_WRITE8_MEMBER(volume_callback); - MCFG_K05324X_CB_MEMBER(lgtnfght_sprite_callback); - MCFG_K05324X_CB_MEMBER(blswhstl_sprite_callback); - MCFG_K05324X_CB_MEMBER(prmrsocr_sprite_callback); + K05324X_CB_MEMBER(lgtnfght_sprite_callback); + K05324X_CB_MEMBER(blswhstl_sprite_callback); + K05324X_CB_MEMBER(prmrsocr_sprite_callback); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/video/asterix.c b/src/mame/video/asterix.c index 7ed056865b3..f297f4e208d 100644 --- a/src/mame/video/asterix.c +++ b/src/mame/video/asterix.c @@ -18,7 +18,7 @@ WRITE16_MEMBER(asterix_state::asterix_spritebank_w) reset_spritebank(machine()); } -MCFG_K05324X_CB_MEMBER(asterix_state::sprite_callback) +K05324X_CB_MEMBER(asterix_state::sprite_callback) { int pri = (*color & 0x00e0) >> 2; if (pri <= m_layerpri[2]) diff --git a/src/mame/video/k053244_k053245.h b/src/mame/video/k053244_k053245.h index e841d38b5e3..41aa668a0bf 100644 --- a/src/mame/video/k053244_k053245.h +++ b/src/mame/video/k053244_k053245.h @@ -4,7 +4,7 @@ typedef device_delegate k05324x_cb_delegate; -#define MCFG_K05324X_CB_MEMBER(_name) void _name(int *code, int *color, int *priority) +#define K05324X_CB_MEMBER(_name) void _name(int *code, int *color, int *priority) #define MCFG_K05324X_BPP(_bpp) \ diff --git a/src/mame/video/lethal.c b/src/mame/video/lethal.c index d691d97a188..067a36b804f 100644 --- a/src/mame/video/lethal.c +++ b/src/mame/video/lethal.c @@ -10,7 +10,7 @@ #include "emu.h" #include "includes/lethal.h" -MCFG_K05324X_CB_MEMBER(lethal_state::sprite_callback) +K05324X_CB_MEMBER(lethal_state::sprite_callback) { int pri = (*color & 0xfff0); *color = *color & 0x000f; diff --git a/src/mame/video/parodius.c b/src/mame/video/parodius.c index b99617e6180..7057eac87ee 100644 --- a/src/mame/video/parodius.c +++ b/src/mame/video/parodius.c @@ -22,7 +22,7 @@ void parodius_tile_callback( running_machine &machine, int layer, int bank, int ***************************************************************************/ -MCFG_K05324X_CB_MEMBER(parodius_state::sprite_callback) +K05324X_CB_MEMBER(parodius_state::sprite_callback) { int pri = 0x20 | ((*color & 0x60) >> 2); if (pri <= m_layerpri[2]) diff --git a/src/mame/video/rollerg.c b/src/mame/video/rollerg.c index d8d562f7f5c..37795d193eb 100644 --- a/src/mame/video/rollerg.c +++ b/src/mame/video/rollerg.c @@ -7,7 +7,7 @@ ***************************************************************************/ -MCFG_K05324X_CB_MEMBER(rollerg_state::sprite_callback) +K05324X_CB_MEMBER(rollerg_state::sprite_callback) { #if 0 if (machine().input().code_pressed(KEYCODE_Q) && (*color & 0x80)) *color = rand(); diff --git a/src/mame/video/surpratk.c b/src/mame/video/surpratk.c index 2b5a077427f..0483b4d7ea4 100644 --- a/src/mame/video/surpratk.c +++ b/src/mame/video/surpratk.c @@ -23,7 +23,7 @@ void surpratk_tile_callback( running_machine &machine, int layer, int bank, int ***************************************************************************/ -MCFG_K05324X_CB_MEMBER(surpratk_state::sprite_callback) +K05324X_CB_MEMBER(surpratk_state::sprite_callback) { int pri = 0x20 | ((*color & 0x60) >> 2); if (pri <= m_layerpri[2]) diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c index 5754704e90e..e47dd5a5e2d 100644 --- a/src/mame/video/tmnt.c +++ b/src/mame/video/tmnt.c @@ -157,7 +157,7 @@ void thndrx2_sprite_callback( running_machine &machine, int *code, int *color, i ***************************************************************************/ -MCFG_K05324X_CB_MEMBER(tmnt_state::lgtnfght_sprite_callback) +K05324X_CB_MEMBER(tmnt_state::lgtnfght_sprite_callback) { int pri = 0x20 | ((*color & 0x60) >> 2); if (pri <= m_layerpri[2]) @@ -172,7 +172,7 @@ MCFG_K05324X_CB_MEMBER(tmnt_state::lgtnfght_sprite_callback) *color = m_sprite_colorbase + (*color & 0x1f); } -MCFG_K05324X_CB_MEMBER(tmnt_state::blswhstl_sprite_callback) +K05324X_CB_MEMBER(tmnt_state::blswhstl_sprite_callback) { #if 0 if (machine().input().code_pressed(KEYCODE_Q) && (*color & 0x20)) *color = rand(); @@ -192,7 +192,7 @@ if (machine().input().code_pressed(KEYCODE_E) && (*color & 0x80)) *color = rand( *color = m_sprite_colorbase + (*color & 0x1f); } -MCFG_K05324X_CB_MEMBER(tmnt_state::prmrsocr_sprite_callback) +K05324X_CB_MEMBER(tmnt_state::prmrsocr_sprite_callback) { int pri = 0x20 | ((*color & 0x60) >> 2); if (pri <= m_layerpri[2])