summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar AJR <ajrhacker@users.noreply.github.com>2017-12-12 13:04:25 -0500
committerGravatarGravatar AJR <ajrhacker@users.noreply.github.com>2017-12-12 13:04:25 -0500
commit13292ccb4e441da06361cd5412fbdd8da363d7a0 (patch) (github)
treef39838a1bd4036074d027be3c3dc3a6e7f6152a0
parentb75dfb6f7cc54d22e83594a1d4b3bbad3ca57bea (diff)
downloadmame-13292ccb4e441da06361cd5412fbdd8da363d7a0.zip
mame-13292ccb4e441da06361cd5412fbdd8da363d7a0.tar.bz2
mermaid.cpp: Don't break games not using ADPCM (nw)
-rw-r--r--src/mame/drivers/mermaid.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/mame/drivers/mermaid.cpp b/src/mame/drivers/mermaid.cpp
index eaf4c46fc5..dfc7754812 100644
--- a/src/mame/drivers/mermaid.cpp
+++ b/src/mame/drivers/mermaid.cpp
@@ -383,12 +383,15 @@ void mermaid_state::machine_reset()
m_rougien_gfxbank1 = 0;
m_rougien_gfxbank2 = 0;
- m_adpcm_idle = 1;
- m_adpcm_rom_sel = 0;
- m_adpcm->reset_w(1);
- m_adpcm_counter->reset_w(1);
- m_adpcm_trigger = 0;
- m_adpcm_data = 0;
+ if (m_adpcm.found())
+ {
+ m_adpcm_idle = 1;
+ m_adpcm_rom_sel = 0;
+ m_adpcm->reset_w(1);
+ m_adpcm_counter->reset_w(1);
+ m_adpcm_trigger = 0;
+ m_adpcm_data = 0;
+ }
}
/* Similar to Jantotsu, apparently the HW has three ports that controls what kind of sample should be played. Every sample size is 0x1000. */