From 51be063c4bfb763ae1e631f89667cd255a9188f3 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Wed, 7 Oct 2020 08:40:17 -0700 Subject: [PATCH] vicdual: Tranquilizer Gun uses the same sound board as Borderline --- scripts/target/mame/arcade.lua | 2 -- scripts/target/mame/nl.lua | 2 -- src/devices/machine/netlist.h | 2 +- src/mame/drivers/vicdual.cpp | 12 ++++++------ src/mame/includes/vicdual.h | 4 ---- src/mame/nl.lst | 1 + 6 files changed, 8 insertions(+), 15 deletions(-) diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index abe23d59dd0..9ba7c1dd7fb 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -3625,8 +3625,6 @@ files { MAME_DIR .. "src/mame/audio/invinco.h", MAME_DIR .. "src/mame/audio/pulsar.cpp", MAME_DIR .. "src/mame/audio/pulsar.h", - MAME_DIR .. "src/mame/audio/tranqgun.cpp", - MAME_DIR .. "src/mame/audio/tranqgun.h", MAME_DIR .. "src/mame/drivers/zaxxon.cpp", MAME_DIR .. "src/mame/includes/zaxxon.h", MAME_DIR .. "src/mame/audio/zaxxon.cpp", diff --git a/scripts/target/mame/nl.lua b/scripts/target/mame/nl.lua index f5c8e88d1e5..15306b6d881 100644 --- a/scripts/target/mame/nl.lua +++ b/scripts/target/mame/nl.lua @@ -309,8 +309,6 @@ files{ MAME_DIR .. "src/mame/audio/invinco.h", MAME_DIR .. "src/mame/audio/pulsar.cpp", MAME_DIR .. "src/mame/audio/pulsar.h", - MAME_DIR .. "src/mame/audio/tranqgun.cpp", - MAME_DIR .. "src/mame/audio/tranqgun.h", MAME_DIR .. "src/mame/machine/segacrpt_device.cpp", MAME_DIR .. "src/mame/machine/segacrpt_device.h", diff --git a/src/devices/machine/netlist.h b/src/devices/machine/netlist.h index 8b9e156adba..0a8dd00618d 100644 --- a/src/devices/machine/netlist.h +++ b/src/devices/machine/netlist.h @@ -17,7 +17,7 @@ #include "../../lib/netlist/nltypes.h" #ifndef NETLIST_CREATE_CSV -#define NETLIST_CREATE_CSV (0) +#define NETLIST_CREATE_CSV (1) #endif class netlist_mame_stream_output_device; diff --git a/src/mame/drivers/vicdual.cpp b/src/mame/drivers/vicdual.cpp index be4c5516c87..e768f20dc2c 100644 --- a/src/mame/drivers/vicdual.cpp +++ b/src/mame/drivers/vicdual.cpp @@ -35,7 +35,7 @@ switch between them. * There existed a vertical version of Head On as well. * According to the manuals, Borderline has the same sound - board as Tranquillizer Gun. + board as Tranquilizer Gun. Known issues/to-do's: * Analog sound missing in many games @@ -1093,7 +1093,7 @@ void vicdual_state::digger(machine_config &config) * Invinco / Head On 2 * Invinco / Deap Scan * Space Attack / Head On - * Tranquillizer Gun + * Tranquilizer Gun * Space Trek * Carnival * Borderline @@ -1140,7 +1140,7 @@ void vicdual_state::sspacaho_io_w(offs_t offset, uint8_t data) void vicdual_state::tranqgun_io_w(offs_t offset, uint8_t data) { - if (offset & 0x01) tranqgun_audio_w(data); + if (offset & 0x01) m_vicdual_sound->write(data); if (offset & 0x02) palette_bank_w(data); if (offset & 0x08) assert_coin_status(); } @@ -2260,7 +2260,7 @@ void vicdual_state::tranqgun(machine_config &config) /* audio hardware */ SPEAKER(config, "mono").front_center(); - tranqgun_audio(config); + BORDERLINE_AUDIO(config, m_vicdual_sound, 0).add_route(ALL_OUTPUTS, "mono", 1.0); } @@ -4017,7 +4017,7 @@ GAME( 1980, samurai, 0, samurai, samurai, vicdual_state, empty_in GAME( 1979, invinco, 0, invinco, invinco, vicdual_state, empty_init, ROT270, "Sega", "Invinco", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 1979, invds, 0, invds, invds, vicdual_state, empty_init, ROT270, "Sega", "Invinco / Deep Scan", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 1979, carhntds, 0, carhntds, carhntds, vicdual_state, empty_init, ROT270, "Sega", "Car Hunt / Deep Scan (France)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) -GAME( 1980, tranqgun, 0, tranqgun, tranqgun, vicdual_state, empty_init, ROT270, "Sega", "Tranquillizer Gun", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) +GAME( 1980, tranqgun, 0, tranqgun, tranqgun, vicdual_state, empty_init, ROT270, "Sega", "Tranquilizer Gun", MACHINE_SUPPORTS_SAVE ) GAME( 1980, spacetrk, 0, spacetrk, spacetrk, vicdual_state, empty_init, ROT270, "Sega", "Space Trek (upright)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 1980, spacetrkc, spacetrk, spacetrk, spacetrkc, vicdual_state, empty_init, ROT270, "Sega", "Space Trek (cocktail)", MACHINE_IMPERFECT_GRAPHICS |MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 1980, carnival, 0, carnival, carnival, carnival_state, empty_init, ROT270, "Sega", "Carnival (upright, AY8912 music)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) @@ -4030,7 +4030,7 @@ GAME( 1981, brdrline, 0, brdrline, brdrline, vicdual_state, empty_in GAME( 1981, starrkr, brdrline, brdrline, starrkr, vicdual_state, empty_init, ROT270, "Sega", "Star Raker", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 1981, brdrlins, brdrline, brdrline, brdrline, vicdual_state, empty_init, ROT270, "bootleg (Sidam)", "Borderline (Sidam bootleg)", MACHINE_SUPPORTS_SAVE ) GAME( 1981, brdrlinb, brdrline, brdrline, brdrline, vicdual_state, empty_init, ROT270, "bootleg (Karateco)", "Borderline (Karateco bootleg)", MACHINE_SUPPORTS_SAVE ) -GAME( 1981, brdrlinet, brdrline, tranqgun, tranqgun, vicdual_state, empty_init, ROT270, "Sega", "Borderline (Tranquillizer Gun conversion)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // official factory conversion +GAME( 1981, brdrlinet, brdrline, tranqgun, tranqgun, vicdual_state, empty_init, ROT270, "Sega", "Borderline (Tranquilizer Gun conversion)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // official factory conversion GAME( 198?, startrks, 0, headons, headons, vicdual_state, empty_init, ROT0, "bootleg (Sidam)", "Star Trek (Head On hardware)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 1980, digger, 0, digger, digger, vicdual_state, empty_init, ROT270, "Sega", "Digger", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 1981, pulsar, 0, pulsar, pulsar, vicdual_state, empty_init, ROT270, "Sega", "Pulsar", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h index 94edc7e6884..d26932a55e9 100644 --- a/src/mame/includes/vicdual.h +++ b/src/mame/includes/vicdual.h @@ -70,7 +70,6 @@ public: void carhntds(machine_config &config); void alphaho(machine_config &config); void tranqgun(machine_config &config); - void tranqgun_audio(machine_config &config); DECLARE_READ_LINE_MEMBER(coin_status_r); DECLARE_READ_LINE_MEMBER(get_64v); @@ -160,9 +159,6 @@ protected: void pulsar_audio_1_w(uint8_t data); void pulsar_audio_2_w(uint8_t data); - /*----------- defined in audio/tranqgun.cpp -----------*/ - void tranqgun_audio_w(uint8_t data); - TIMER_DEVICE_CALLBACK_MEMBER(clear_coin_status); DECLARE_MACHINE_START(samurai); diff --git a/src/mame/nl.lst b/src/mame/nl.lst index 0071872f41d..206b9a6d694 100644 --- a/src/mame/nl.lst +++ b/src/mame/nl.lst @@ -370,6 +370,7 @@ brdrline // (c) 1980 Sega brdrlinet // (c) 1981 Sega brdrlins // Sidam bootleg starrkr // (c) 1981 Sega +tranqgun // 413-428 (c) 1980 Sega frogs // 112-119 [1978 Gremlin?] @source:zaxxon.cpp