summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Scott Stone <tafoid@users.noreply.github.com>2012-04-02 20:58:55 +0000
committer Scott Stone <tafoid@users.noreply.github.com>2012-04-02 20:58:55 +0000
commit6f0793d62cedacd25053d4ab8a9bb664d150ac2e (patch)
tree7c6e28ac04972308ab3e97e720914543b1d689e7
parent1f1c6019380053f1ce1a954ffac652cdb8d0f736 (diff)
More proper fix for MT#4734 (nw)
-rw-r--r--src/mame/audio/gottlieb.c6
-rw-r--r--src/mame/drivers/gottlieb.c26
2 files changed, 21 insertions, 11 deletions
diff --git a/src/mame/audio/gottlieb.c b/src/mame/audio/gottlieb.c
index 36568bfd6cc..8c7fbbcee68 100644
--- a/src/mame/audio/gottlieb.c
+++ b/src/mame/audio/gottlieb.c
@@ -161,11 +161,9 @@ logerror("Votrax: intonation %d, phoneme %02x %s\n",data >> 6,data & 0x3f,Phonem
}
mame_printf_debug("Votrax played '%s'\n", phonemes);
+
if (strcmp(phonemes, "[0] HEH3LOOW AH1EH3I3YMTERI2NDAHN") == 0) /* Q-Bert & Tylz - Hello, I am turned on */
- {
- if (strcmp(machine().system().name, "tylz") != 0) /* Playing this in tylz will crash the game */
- m_samples->start(0, 42);
- }
+ m_samples->start(0, 42);
else if (strcmp(phonemes, "[0]BAH1EH1Y") == 0) /* Q-Bert - Bye, bye */
m_samples->start(0, 43);
else if (strcmp(phonemes, "[0]A2YHT LEH2FTTH") == 0) /* Reactor - Eight left */
diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c
index ffd5a73a0c2..ae100f72e41 100644
--- a/src/mame/drivers/gottlieb.c
+++ b/src/mame/drivers/gottlieb.c
@@ -1750,12 +1750,6 @@ static MACHINE_CONFIG_DERIVED( gottlieb1, gottlieb_core )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED( gottlieb1_votrax, gottlieb_core )
- MCFG_GOTTLIEB_SOUND_R1_ADD_VOTRAX("r1sound")
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
-MACHINE_CONFIG_END
-
-
static MACHINE_CONFIG_DERIVED( gottlieb2, gottlieb_core )
MCFG_GOTTLIEB_SOUND_R2_ADD("r2sound")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -1802,8 +1796,21 @@ static MACHINE_CONFIG_DERIVED( qbert, gottlieb1 )
MCFG_FRAGMENT_ADD(qbert_samples)
MACHINE_CONFIG_END
+
+static MACHINE_CONFIG_DERIVED( tylz, gottlieb1 )
+ MCFG_FRAGMENT_ADD(qbert_samples)
+MACHINE_CONFIG_END
+
+
#else
+
+static MACHINE_CONFIG_DERIVED( gottlieb1_votrax, gottlieb_core )
+ MCFG_GOTTLIEB_SOUND_R1_ADD_VOTRAX("r1sound")
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+MACHINE_CONFIG_END
+
+
static MACHINE_CONFIG_DERIVED( reactor, gottlieb1_votrax )
/* basic machine hardware */
@@ -1817,6 +1824,11 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( qbert, gottlieb1_votrax )
MACHINE_CONFIG_END
+
+static MACHINE_CONFIG_DERIVED( tylz, gottlieb1_votrax )
+MACHINE_CONFIG_END
+
+
#endif
@@ -2492,7 +2504,7 @@ GAME( 1982, myqbert, qbert, qbert, qbert, romtiles, ROT270, "Gottlieb
GAME( 1982, qberttst, qbert, qbert, qbert, romtiles, ROT270, "Gottlieb", "Q*bert (early test version)", GAME_IMPERFECT_SOUND )
GAME( 1982, qbtrktst, qbert, qbert, qbert, romtiles, ROT270, "Gottlieb", "Q*bert Board Input Test Rom", GAME_IMPERFECT_SOUND )
GAME( 1982, insector, 0, gottlieb1, insector, romtiles, ROT0, "Gottlieb", "Insector (prototype)", 0 )
-GAME( 1982, tylz, 0, gottlieb1_votrax, tylz, romtiles, ROT0, "Mylstar", "Tylz (prototype)", GAME_IMPERFECT_SOUND ) // modified sound hw?
+GAME( 1982, tylz, 0, tylz, tylz, romtiles, ROT0, "Mylstar", "Tylz (prototype)", GAME_IMPERFECT_SOUND ) // modified sound hw?
GAME( 1984, argusg, 0, gottlieb1, argusg, ramtiles, ROT0, "Gottlieb", "Argus (Gottlieb, prototype)" , 0) // aka Guardian / Protector?
GAME( 1983, mplanets, 0, gottlieb1, mplanets, romtiles, ROT270, "Gottlieb", "Mad Planets", 0 )
GAME( 1983, mplanetsuk,mplanets, gottlieb1, mplanets, romtiles, ROT270, "Gottlieb (Taitel license)", "Mad Planets (UK)", 0 )