summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/video/artmagic.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/video/artmagic.cpp')
-rw-r--r--src/mame/video/artmagic.cpp17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/mame/video/artmagic.cpp b/src/mame/video/artmagic.cpp
index 41752d82bf9..389ecc34091 100644
--- a/src/mame/video/artmagic.cpp
+++ b/src/mame/video/artmagic.cpp
@@ -26,9 +26,9 @@ inline uint16_t *artmagic_state::address_to_vram(offs_t *address)
offs_t original = *address;
*address = (original & 0x001fffff) >> 4;
if (original < 0x001fffff)
- return m_vram0;
+ return m_vram[0];
else if (original >= 0x00400000 && original < 0x005fffff)
- return m_vram1;
+ return m_vram[1];
return nullptr;
}
@@ -42,9 +42,6 @@ inline uint16_t *artmagic_state::address_to_vram(offs_t *address)
void artmagic_state::video_start()
{
- m_blitter_base = (uint16_t *)memregion("gfx1")->base();
- m_blitter_mask = memregion("gfx1")->bytes()/2 - 1;
-
save_item(NAME(m_xor));
save_item(NAME(m_is_stoneball));
save_item(NAME(m_blitter_data));
@@ -84,7 +81,7 @@ TMS340X0_FROM_SHIFTREG_CB_MEMBER(artmagic_state::from_shiftreg)
void artmagic_state::execute_blit()
{
- uint16_t *dest = m_blitter_page ? m_vram0 : m_vram1;
+ uint16_t *dest = m_vram[m_blitter_page ^ 1];
int offset = ((m_blitter_data[1] & 0xff) << 16) | m_blitter_data[0];
int color = (m_blitter_data[1] >> 4) & 0xf0;
int x = (int16_t)m_blitter_data[2];
@@ -222,7 +219,7 @@ void artmagic_state::execute_blit()
}
else /* following lines */
{
- int val = m_blitter_base[offset & m_blitter_mask];
+ int val = m_blitter_base[offset & m_blitter_base.mask()];
/* ultennis, stonebal */
last ^= 4;
@@ -237,7 +234,7 @@ void artmagic_state::execute_blit()
for (j = 0; j < w; j += 4)
{
- uint16_t val = m_blitter_base[(offset + j/4) & m_blitter_mask];
+ uint16_t val = m_blitter_base[(offset + j/4) & m_blitter_base.mask()];
if (sx < 508)
{
if (h == 1 && m_is_stoneball)
@@ -297,7 +294,7 @@ void artmagic_state::execute_blit()
}
-READ16_MEMBER(artmagic_state::artmagic_blitter_r)
+READ16_MEMBER(artmagic_state::blitter_r)
{
/*
bit 1 is a busy flag; loops tightly if clear
@@ -313,7 +310,7 @@ READ16_MEMBER(artmagic_state::artmagic_blitter_r)
}
-WRITE16_MEMBER(artmagic_state::artmagic_blitter_w)
+WRITE16_MEMBER(artmagic_state::blitter_w)
{
COMBINE_DATA(&m_blitter_data[offset]);