From 983ab0ee23df8edd3e85e9d19c498bcb8852f1c2 Mon Sep 17 00:00:00 2001 From: Osso Date: Fri, 28 Nov 2014 08:00:54 +0100 Subject: ssv.c: use required_region_ptr instead of required_memory_region and removed 2 unused variables (nw) --- src/mame/drivers/ssv.c | 7 ++----- src/mame/includes/ssv.h | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c index 6597fafb019..1f18ff0b94a 100644 --- a/src/mame/drivers/ssv.c +++ b/src/mame/drivers/ssv.c @@ -852,15 +852,12 @@ ADDRESS_MAP_END READ16_MEMBER(ssv_state::eaglshot_gfxrom_r) { - UINT8 *rom = m_region_gfx1->base(); - size_t size = m_region_gfx1->bytes(); - offset = offset * 2 + m_gfxrom_select * 0x200000; - if (offset > size) + if (offset > m_gfx1_rom.length()) return 0xffff; - return rom[offset] + (rom[offset+1]<<8); + return m_gfx1_rom[offset] + (m_gfx1_rom[offset+1]<<8); } WRITE16_MEMBER(ssv_state::eaglshot_gfxrom_w) diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h index 1128bfac293..882350b81d7 100644 --- a/src/mame/includes/ssv.h +++ b/src/mame/includes/ssv.h @@ -21,7 +21,7 @@ public: m_gdfs_tmapscroll(*this, "gdfs_tmapscroll"), m_gdfs_st0020(*this, "st0020_spr"), m_input_sel(*this, "input_sel"), - m_region_gfx1(*this, "gfx1"), + m_gfx1_rom(*this, "gfx1"), m_io_gunx1(*this, "GUNX1"), m_io_guny1(*this, "GUNY1"), m_io_gunx2(*this, "GUNX2"), @@ -63,15 +63,12 @@ public: UINT8 m_requested_int; UINT16 m_irq_enable; - UINT16 *m_dsp_ram; - UINT16 *m_eaglshot_gfxram; tilemap_t *m_gdfs_tmap; int m_interrupt_ultrax; - int m_gdfs_gfxram_bank; int m_gdfs_lightgun_select; UINT16 m_sxyreact_serial; @@ -167,7 +164,7 @@ public: void init_st010(); protected: - required_memory_region m_region_gfx1; + required_region_ptr m_gfx1_rom; optional_ioport m_io_gunx1; optional_ioport m_io_guny1; optional_ioport m_io_gunx2; -- cgit v1.2.3