summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/segaxbd.cpp
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /src/mame/drivers/segaxbd.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/drivers/segaxbd.cpp')
-rw-r--r--src/mame/drivers/segaxbd.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp
index 38452f859a1..8287207e302 100644
--- a/src/mame/drivers/segaxbd.cpp
+++ b/src/mame/drivers/segaxbd.cpp
@@ -732,7 +732,7 @@ WRITE8_MEMBER(segaxbd_state::smgp_motor_w)
READ8_MEMBER(segaxbd_rascot_state::commram_r)
{
- return m_commram->right_r(m_commram_bank << 3 | offset);
+ return m_commram->right_r(space, m_commram_bank << 3 | offset);
}
@@ -743,7 +743,7 @@ READ8_MEMBER(segaxbd_rascot_state::commram_r)
WRITE8_MEMBER(segaxbd_rascot_state::commram_w)
{
- m_commram->right_w(m_commram_bank << 3 | offset, data);
+ m_commram->right_w(space, m_commram_bank << 3 | offset, data);
}
@@ -887,9 +887,9 @@ void segaxbd_state::palette_init()
int i2 = (value >> 2) & 1;
int i1 = (value >> 1) & 1;
int i0 = (value >> 0) & 1;
- m_palette_normal[value] = combine_weights(weights_normal, i0, i1, i2, i3, i4, 0);
- m_palette_shadow[value] = combine_weights(weights_sh, i0, i1, i2, i3, i4, 0);
- m_palette_hilight[value] = combine_weights(weights_sh, i0, i1, i2, i3, i4, 1);
+ m_palette_normal[value] = combine_6_weights(weights_normal, i0, i1, i2, i3, i4, 0);
+ m_palette_shadow[value] = combine_6_weights(weights_sh, i0, i1, i2, i3, i4, 0);
+ m_palette_hilight[value] = combine_6_weights(weights_sh, i0, i1, i2, i3, i4, 1);
}
}
@@ -1789,7 +1789,7 @@ void segaxbd_new_state_double::sega_xboard_fd1094_double(machine_config &config)
SEGA_XBD_FD1094(config, "mainpcb", 0);
SEGA_XBD_FD1094(config, "subpcb", 0);
- //config.m_perfect_cpu_quantum = subtag("mainpcb:maincpu"); // doesn't help..
+ //MCFG_QUANTUM_PERFECT_CPU("mainpcb:maincpu") // doesn't help..
}