diff options
author | Vas Crabb <vas@vastheman.com> | 2018-05-15 05:43:28 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2018-05-15 05:43:28 +1000 |
commit | 23325728009b85bad264dcc175c8f1b8c5e51678 (patch) | |
tree | 47e270288dae6d6e6f2cce33c779e94ffc2d39ab /src/mame/drivers/cclimber.cpp | |
parent | d1f8569f4d2729631ef5c3fd6de4e3cfca9856e8 (diff) |
More cleanup/streamlining of machine configuration and macros:
* Get rid of implicit prefix for GFX decode names and prefix them all
* Get rid of special macro for adding GFXDECODE in favour of constructor
* Make empty GFX decode a static member of interface
* Allow palette to be specified to GFXDECODE as a device finder
* Removed diserial.h from emu.h as it's used relatively infrequently
Also fix darkseal and vaportra propely. The palette device
automatically attaches itself to a share with matching tag. The correct
solution here is to rename one or the other out of the way, since it was
never attached to a share before.
Diffstat (limited to 'src/mame/drivers/cclimber.cpp')
-rw-r--r-- | src/mame/drivers/cclimber.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mame/drivers/cclimber.cpp b/src/mame/drivers/cclimber.cpp index 2e65a074090..7482e77bbb8 100644 --- a/src/mame/drivers/cclimber.cpp +++ b/src/mame/drivers/cclimber.cpp @@ -1072,25 +1072,25 @@ static const gfx_layout swimmer_spritelayout = 32*8 }; -static GFXDECODE_START( cclimber ) +static GFXDECODE_START( gfx_cclimber ) GFXDECODE_ENTRY( "gfx1", 0x0000, cclimber_charlayout, 0, 16 ) /* characters */ GFXDECODE_ENTRY( "gfx1", 0x0000, cclimber_spritelayout, 0, 16 ) /* sprites */ GFXDECODE_ENTRY( "gfx2", 0x0000, cclimber_charlayout, 16*4, 8 ) /* big sprites */ GFXDECODE_END -static GFXDECODE_START( cannonb ) +static GFXDECODE_START( gfx_cannonb ) GFXDECODE_ENTRY( "gfx1", 0x0000, cannonb_charlayout, 0, 16 ) /* characters */ GFXDECODE_ENTRY( "gfx1", 0x1000, cannonb_spritelayout, 0, 16 ) /* sprites */ GFXDECODE_ENTRY( "gfx2", 0x0000, cclimber_charlayout, 16*4, 8 ) /* big sprites */ GFXDECODE_END -static GFXDECODE_START( swimmer ) +static GFXDECODE_START( gfx_swimmer ) GFXDECODE_ENTRY( "gfx1", 0x0000, swimmer_charlayout, 0, 32 ) /* characters */ GFXDECODE_ENTRY( "gfx1", 0x0000, swimmer_spritelayout, 0, 32 ) /* sprites */ GFXDECODE_ENTRY( "gfx2", 0x0000, swimmer_charlayout, 32*8, 4 ) /* big sprites */ GFXDECODE_END -static GFXDECODE_START( toprollr ) +static GFXDECODE_START( gfx_toprollr ) GFXDECODE_ENTRY( "gfx1", 0x0000, cclimber_charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 0x0000, cclimber_spritelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0x0000, cclimber_charlayout, 16*4, 8 ) /* big sprites */ @@ -1131,7 +1131,7 @@ MACHINE_CONFIG_START(cclimber_state::root) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cclimber_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", cclimber) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cclimber) MCFG_PALETTE_ADD("palette", 16*4+8*4) MCFG_PALETTE_INIT_OWNER(cclimber_state,cclimber) @@ -1176,7 +1176,7 @@ MACHINE_CONFIG_START(cclimber_state::cannonb) MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) // not used /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", cannonb) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_cannonb) MACHINE_CONFIG_END MACHINE_CONFIG_START(cclimber_state::bagmanf) @@ -1239,7 +1239,7 @@ MACHINE_CONFIG_START(cclimber_state::toprollr) MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, cclimber_state, toprollr_rombank_w)) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", toprollr) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_toprollr) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(32*5) MCFG_PALETTE_INIT_OWNER(cclimber_state,toprollr) @@ -1278,7 +1278,7 @@ MACHINE_CONFIG_START(cclimber_state::swimmer) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cclimber_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", swimmer) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_swimmer) MCFG_PALETTE_ADD("palette", 32*8+4*8+1) MCFG_PALETTE_INIT_OWNER(cclimber_state,swimmer) |