From 431152bf052669dcbc54b369b795d7590d079685 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 23 Jun 2015 07:27:57 +0200 Subject: [PATCH] Revert "fix astrocde (nw)" This reverts commit 31a1f6b01f85609486c73e67279e263edb6fc6da. --- scripts/target/mame/arcade.lua | 3 ++- scripts/target/mame/tiny.lua | 3 ++- src/mame/audio/astrocde.c | 11 ----------- src/mame/audio/{gorf.inc => gorf.c} | 5 +++++ src/mame/audio/{wow.inc => wow.c} | 17 +++++++++++------ 5 files changed, 20 insertions(+), 19 deletions(-) delete mode 100644 src/mame/audio/astrocde.c rename src/mame/audio/{gorf.inc => gorf.c} (98%) rename src/mame/audio/{wow.inc => wow.c} (93%) diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index 1aaccf5a212..f48ef035c4a 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -1986,7 +1986,8 @@ createMAMEProjects(_target, _subtarget, "midway") files { MAME_DIR .. "src/mame/drivers/astrocde.c", MAME_DIR .. "src/mame/video/astrocde.c", - MAME_DIR .. "src/mame/audio/astrocde.c", + MAME_DIR .. "src/mame/audio/gorf.c", + MAME_DIR .. "src/mame/audio/wow.c", MAME_DIR .. "src/mame/drivers/atlantis.c", MAME_DIR .. "src/mame/drivers/balsente.c", MAME_DIR .. "src/mame/machine/balsente.c", diff --git a/scripts/target/mame/tiny.lua b/scripts/target/mame/tiny.lua index 4403fc9ac92..5594593d113 100644 --- a/scripts/target/mame/tiny.lua +++ b/scripts/target/mame/tiny.lua @@ -122,7 +122,6 @@ function createProjects_mame_tiny(_target, _subtarget) MAME_DIR .. "src/mame/audio/targ.c", MAME_DIR .. "src/mame/drivers/astrocde.c", MAME_DIR .. "src/mame/video/astrocde.c", - MAME_DIR .. "src/mame/audio/astrocde.c", MAME_DIR .. "src/mame/drivers/gridlee.c", MAME_DIR .. "src/mame/audio/gridlee.c", MAME_DIR .. "src/mame/video/gridlee.c", @@ -130,6 +129,8 @@ function createProjects_mame_tiny(_target, _subtarget) MAME_DIR .. "src/mame/machine/williams.c", MAME_DIR .. "src/mame/audio/williams.c", MAME_DIR .. "src/mame/video/williams.c", + MAME_DIR .. "src/mame/audio/gorf.c", + MAME_DIR .. "src/mame/audio/wow.c", MAME_DIR .. "src/mame/drivers/gaelco.c", MAME_DIR .. "src/mame/video/gaelco.c", MAME_DIR .. "src/mame/machine/gaelcrpt.c", diff --git a/src/mame/audio/astrocde.c b/src/mame/audio/astrocde.c deleted file mode 100644 index 41bf9deba8f..00000000000 --- a/src/mame/audio/astrocde.c +++ /dev/null @@ -1,11 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Mike Coates -//************************************************************************** - - -#include "emu.h" -#include "cpu/z80/z80.h" -#include "includes/astrocde.h" - -#include "gorf.inc" -#include "wow.inc" diff --git a/src/mame/audio/gorf.inc b/src/mame/audio/gorf.c similarity index 98% rename from src/mame/audio/gorf.inc rename to src/mame/audio/gorf.c index abeb6d4fa65..0114cb5afb3 100644 --- a/src/mame/audio/gorf.inc +++ b/src/mame/audio/gorf.c @@ -19,6 +19,11 @@ gorf_sh_ update- Null **************************************************************************/ +#include "emu.h" +#include "cpu/z80/z80.h" +#include "includes/astrocde.h" + + /**************************************************************************** * 64 Phonemes - currently 1 sample per phoneme, will be combined sometime! ****************************************************************************/ diff --git a/src/mame/audio/wow.inc b/src/mame/audio/wow.c similarity index 93% rename from src/mame/audio/wow.inc rename to src/mame/audio/wow.c index 9c7a17c5302..e6a1b8888bd 100644 --- a/src/mame/audio/wow.inc +++ b/src/mame/audio/wow.c @@ -20,11 +20,16 @@ wow_sh_ update- Null **************************************************************************/ +#include "emu.h" +#include "cpu/z80/z80.h" +#include "includes/astrocde.h" + + /**************************************************************************** * 64 Phonemes - currently 1 sample per phoneme, will be combined sometime! ****************************************************************************/ -static const char *const PhonemeTable_wow[65] = +static const char *const PhonemeTable[65] = { "EH3","EH2","EH1","PA0","DT" ,"A1" ,"A2" ,"ZH", "AH2","I3" ,"I2" ,"I1" ,"M" ,"N" ,"B" ,"V", @@ -67,7 +72,7 @@ static const char *const wowWordTable[] = "YI3U", "Y1IUU", "YIUUI", "Y1IUU1U1", "YI3U1", "Y1IUUL", "YIUU1L", "Y1IUUD", "YO2O2R",0 }; -#define num_samples_wow (sizeof(wowWordTable)/sizeof(char *)) +#define num_samples (sizeof(wowWordTable)/sizeof(char *)) const char *const wow_sample_names[] = @@ -109,7 +114,7 @@ READ8_MEMBER( astrocde_state::wow_speech_r ) Phoneme = data & 0x3F; //Intonation = data >> 6; - //logerror("Data : %d Speech : %s at intonation %d\n",Phoneme, PhonemeTable_wow[Phoneme],Intonation); + //logerror("Data : %d Speech : %s at intonation %d\n",Phoneme, PhonemeTable[Phoneme],Intonation); if(Phoneme==63) { m_samples->stop(0); @@ -123,11 +128,11 @@ READ8_MEMBER( astrocde_state::wow_speech_r ) /* Phoneme to word translation */ if (*(m_totalword) == 0) { - strcpy(m_totalword,PhonemeTable_wow[Phoneme]); /* Copy over the first phoneme */ + strcpy(m_totalword,PhonemeTable[Phoneme]); /* Copy over the first phoneme */ if (m_plural != 0) { //logerror("found a possible plural at %d\n",m_plural-1); if (!strcmp("S",m_totalword)) { /* Plural check */ - m_samples->start(0, num_samples_wow-2); /* play the sample at position of word */ + m_samples->start(0, num_samples-2); /* play the sample at position of word */ m_samples->set_frequency(0, 11025); /* play at correct rate */ m_totalword[0] = 0; /* Clear the total word stack */ m_oldword[0] = 0; /* Clear the total word stack */ @@ -137,7 +142,7 @@ READ8_MEMBER( astrocde_state::wow_speech_r ) } } } else - strcat(m_totalword,PhonemeTable_wow[Phoneme]); /* Copy over the first phoneme */ + strcat(m_totalword,PhonemeTable[Phoneme]); /* Copy over the first phoneme */ //logerror("Total word = %s\n",m_totalword);