From 904ccb1603c3898d0db8223a15f5bc06e8c3eb4d Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Thu, 13 Sep 2012 04:31:57 +0000 Subject: Fix winrun regression. --- src/mame/drivers/namcoic.c | 2 +- src/mame/drivers/namcos2.c | 4 ++-- src/mame/drivers/namcos21.c | 4 ++-- src/mame/includes/namcos2.h | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/mame/drivers/namcoic.c b/src/mame/drivers/namcoic.c index 58193757dbc..bda14a94146 100644 --- a/src/mame/drivers/namcoic.c +++ b/src/mame/drivers/namcoic.c @@ -888,7 +888,7 @@ void namcos2_shared_state::c355_obj_init(int gfxbank, int pal_xor, c355_obj_code else m_c355_obj_code2tile = c355_obj_code2tile_delegate(FUNC(namcos2_shared_state::c355_obj_default_code2tile), this); - memset(&m_c355_obj_ram[0], 0, memshare("objram")->bytes()); // needed for Nebulas Ray + memset(m_c355_obj_ram, 0, sizeof(m_c355_obj_ram)); // needed for Nebulas Ray memset(m_c355_obj_position, 0, sizeof(m_c355_obj_position)); } diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c index 7a2b67184dd..23e376988ec 100644 --- a/src/mame/drivers/namcos2.c +++ b/src/mame/drivers/namcos2.c @@ -654,7 +654,7 @@ ADDRESS_MAP_END /*************************************************************/ static ADDRESS_MAP_START( common_sgunner_am, AS_PROGRAM, 16, namcos2_state ) - AM_RANGE(0x800000, 0x8141ff) AM_READWRITE(c355_obj_ram_r,c355_obj_ram_w) AM_SHARE("objram") + AM_RANGE(0x800000, 0x8141ff) AM_READWRITE(c355_obj_ram_r,c355_obj_ram_w) AM_RANGE(0x818000, 0x818001) AM_WRITENOP AM_RANGE(0xa00000, 0xa0000f) AM_READWRITE_LEGACY(namcos2_68k_key_r,namcos2_68k_key_w) AM_IMPORT_FROM( namcos2_68k_default_cpu_board_am ) @@ -703,7 +703,7 @@ ADDRESS_MAP_END /*************************************************************/ static ADDRESS_MAP_START( common_luckywld_am, AS_PROGRAM, 16, namcos2_state ) - AM_RANGE(0x800000, 0x8141ff) AM_READWRITE(c355_obj_ram_r,c355_obj_ram_w) AM_SHARE("objram") + AM_RANGE(0x800000, 0x8141ff) AM_READWRITE(c355_obj_ram_r,c355_obj_ram_w) AM_RANGE(0x818000, 0x818001) AM_NOP /* enable? */ AM_RANGE(0x81a000, 0x81a001) AM_WRITENOP /* enable? */ AM_RANGE(0x840000, 0x840001) AM_READNOP diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c index 1439a0dc021..8b91174202c 100644 --- a/src/mame/drivers/namcos21.c +++ b/src/mame/drivers/namcos21.c @@ -1074,7 +1074,7 @@ READ16_MEMBER(namcos21_state::NAMCO_C139_SCI_register_r){ return 0; } AM_RANGE(0x440000, 0x440001) AM_READWRITE(pointram_data_r,pointram_data_w) \ AM_RANGE(0x440002, 0x47ffff) AM_WRITENOP /* (?) Air Combat */ \ AM_RANGE(0x480000, 0x4807ff) AM_READWRITE(namcos21_depthcue_r,namcos21_depthcue_w) /* Air Combat */ \ - AM_RANGE(0x700000, 0x71ffff) AM_READWRITE(c355_obj_ram_r,c355_obj_ram_w) AM_SHARE("objram") \ + AM_RANGE(0x700000, 0x71ffff) AM_READWRITE(c355_obj_ram_r,c355_obj_ram_w) \ AM_RANGE(0x720000, 0x720007) AM_READWRITE(c355_obj_position_r,c355_obj_position_w) \ AM_RANGE(0x740000, 0x75ffff) AM_READWRITE(paletteram16_r,paletteram16_w) AM_SHARE("paletteram") \ AM_RANGE(0x760000, 0x760001) AM_READWRITE(namcos21_video_enable_r,namcos21_video_enable_w) \ @@ -1414,7 +1414,7 @@ ADDRESS_MAP_END //////////////////////////////////////////////////////////////////////////////// #define DRIVEYES_68K_COMMON \ - AM_RANGE(0x700000, 0x71ffff) AM_READWRITE(c355_obj_ram_r,c355_obj_ram_w) AM_SHARE("objram") \ + AM_RANGE(0x700000, 0x71ffff) AM_READWRITE(c355_obj_ram_r,c355_obj_ram_w) \ AM_RANGE(0x720000, 0x720007) AM_READWRITE(c355_obj_position_r,c355_obj_position_w) \ AM_RANGE(0x740000, 0x75ffff) AM_READWRITE(paletteram16_r,paletteram16_w) AM_SHARE("paletteram") \ AM_RANGE(0x760000, 0x760001) AM_READWRITE(namcos21_video_enable_r,namcos21_video_enable_w) \ diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h index f51eb7c0c01..924985fc966 100644 --- a/src/mame/includes/namcos2.h +++ b/src/mame/includes/namcos2.h @@ -98,7 +98,6 @@ public: m_c169_roz_videoram(*this, "rozvideoram", 0), m_c169_roz_gfxbank(0), m_c169_roz_mask(NULL), - m_c355_obj_ram(*this, "objram", 0), m_c355_obj_gfxbank(0), m_c355_obj_palxor(0) { } @@ -168,11 +167,11 @@ protected: template void c355_obj_draw_list(_BitmapClass &bitmap, const rectangle &cliprect, int pri, const UINT16 *pSpriteList16, const UINT16 *pSpriteTable); - optional_shared_ptr m_c355_obj_ram; c355_obj_code2tile_delegate m_c355_obj_code2tile; int m_c355_obj_gfxbank; int m_c355_obj_palxor; UINT16 m_c355_obj_position[4]; + UINT16 m_c355_obj_ram[0x20000/2]; public: // general -- cgit v1.2.3