From 39f58071fb10aed31cb242b5e48590ded390dea9 Mon Sep 17 00:00:00 2001 From: Scott Stone Date: Fri, 1 Jun 2012 08:01:51 +0000 Subject: [PATCH] Removed duplicate code which necessitated separate samples for War of the Worlds (color) [wotwc]. Both display types now only need the one sample set (wotw). [Tafoid] --- src/mame/audio/cinemat.c | 116 +------------------------------------ src/mame/drivers/cinemat.c | 4 +- 2 files changed, 3 insertions(+), 117 deletions(-) diff --git a/src/mame/audio/cinemat.c b/src/mame/audio/cinemat.c index 64b29be3b4c..ff8ebaa3b09 100644 --- a/src/mame/audio/cinemat.c +++ b/src/mame/audio/cinemat.c @@ -1196,7 +1196,7 @@ MACHINE_CONFIG_END /************************************* * - * War of the Worlds (B&W) + * War of the Worlds * *************************************/ @@ -1308,120 +1308,6 @@ MACHINE_CONFIG_END -/************************************* - * - * War of the Worlds (color) - * - *************************************/ - -static const char *const wotwc_sample_names[] = -{ - "*wotwc", - "cfire", - "shield", - "star", - "thrust", - "drone", - "lexplode", - "sexplode", - "pfire", - 0 -}; - -static const samples_interface wotwc_samples_interface = -{ - 8, - wotwc_sample_names -}; - -static void wotwc_sound_w(running_machine &machine, UINT8 sound_val, UINT8 bits_changed) -{ - cinemat_state *state = machine.driver_data(); - samples_device *samples = machine.device("samples"); - UINT32 target_pitch; - - /* on the rising edge of bit 0x10, clock bit 0x80 into the shift register */ - if (SOUNDVAL_RISING_EDGE(0x10)) - state->m_current_shift = ((state->m_current_shift >> 1) & 0x7f) | (sound_val & 0x80); - - /* execute on the rising edge of bit 0x01 */ - if (SOUNDVAL_RISING_EDGE(0x01)) - { - /* fireball - falling edge */ - if (SHIFTREG_FALLING_EDGE(0x80)) - samples->start(0, 0); - - /* shield hit - falling edge */ - if (SHIFTREG_FALLING_EDGE(0x40)) - samples->start(1, 1); - - /* star sound - 0=off, 1=on */ - if (SHIFTREG_RISING_EDGE(0x20)) - samples->start(2, 2, true); - if (SHIFTREG_FALLING_EDGE(0x20)) - samples->stop(2); - - /* thrust sound - 1=off, 0=on*/ - if (SHIFTREG_FALLING_EDGE(0x10)) - samples->start(3, 3, true); - if (SHIFTREG_RISING_EDGE(0x10)) - samples->stop(3); - - /* drone - 1=off, 0=on */ - if (SHIFTREG_FALLING_EDGE(0x08)) - samples->start(4, 4, true); - if (SHIFTREG_RISING_EDGE(0x08)) - samples->stop(4); - - /* latch the drone pitch */ - target_pitch = (state->m_current_shift & 7) + ((state->m_current_shift & 2) << 2); - target_pitch = 0x10000 + (target_pitch << 12); - - /* once per frame slide the pitch toward the target */ - if (machine.primary_screen->frame_number() > state->m_last_frame) - { - if (state->m_current_pitch > target_pitch) - state->m_current_pitch -= 300; - if (state->m_current_pitch < target_pitch) - state->m_current_pitch += 200; - samples->set_frequency(4, state->m_current_pitch); - state->m_last_frame = machine.primary_screen->frame_number(); - } - - /* remember the previous value */ - state->m_last_shift = state->m_current_shift; - } - - /* loud explosion - falling edge */ - if (SOUNDVAL_FALLING_EDGE(0x02)) - samples->start(5, 5); - - /* soft explosion - falling edge */ - if (SOUNDVAL_FALLING_EDGE(0x04)) - samples->start(6, 6); - - /* player fire - falling edge */ - if (SOUNDVAL_FALLING_EDGE(0x08)) - samples->start(7, 7); -} - -static MACHINE_RESET( wotwc ) -{ - generic_init(machine, wotwc_sound_w); -} - -MACHINE_CONFIG_FRAGMENT( wotwc_sound ) - MCFG_MACHINE_START(generic) - MCFG_MACHINE_RESET(wotwc) - - MCFG_SPEAKER_STANDARD_MONO("mono") - - MCFG_SAMPLES_ADD("samples", wotwc_samples_interface) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) -MACHINE_CONFIG_END - - - /************************************* * * Demon diff --git a/src/mame/drivers/cinemat.c b/src/mame/drivers/cinemat.c index 51d9e304ba5..224690139c5 100644 --- a/src/mame/drivers/cinemat.c +++ b/src/mame/drivers/cinemat.c @@ -1088,7 +1088,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( armora, cinemat_jmi_16k ) MCFG_FRAGMENT_ADD(armora_sound) MACHINE_CONFIG_END - + static MACHINE_CONFIG_DERIVED( ripoff, cinemat_jmi_8k ) MCFG_FRAGMENT_ADD(ripoff_sound) @@ -1122,7 +1122,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( wotwc, cinemat_jmi_16k ) - MCFG_FRAGMENT_ADD(wotwc_sound) + MCFG_FRAGMENT_ADD(wotw_sound) MCFG_VIDEO_START(cinemat_color) MACHINE_CONFIG_END