diff --git a/source/fileio/filetab.cpp b/source/fileio/filetab.cpp index 5c1614ee7..9c179d93b 100644 --- a/source/fileio/filetab.cpp +++ b/source/fileio/filetab.cpp @@ -6,7 +6,7 @@ char *FilenameList[FILEPOS_MAX]= { "BIGLUMP.BIN", -"BIGLUMP.BIN", +"TRACK1.IXA", "THQ.STR", "INTRO.STR", //"CLIMAX.STR", @@ -37,6 +37,7 @@ void CalcFilePos(int *Dst) int Pos; char Name[32]; sprintf(Name,"\\%s;1",FilenameList[Loop]); + printf("%s\n",Name); while ( !CdSearchFile(&RetFile,Name) ); Dst[Loop]=CdPosToInt(&RetFile.pos); } diff --git a/source/sound/cdxa.cpp b/source/sound/cdxa.cpp index 3a53dcf66..3b76cf96d 100644 --- a/source/sound/cdxa.cpp +++ b/source/sound/cdxa.cpp @@ -19,7 +19,7 @@ // Add this to have CDXA on PC build!! // You will need a CD with Track1 synced to something, oh, and a CD drive -#if defined(__USER_paul__)//|| defined(__USER_daveo__) +#if 0//|| defined(__USER_daveo__) #define FORCE_XA 1 #endif diff --git a/source/sound/cdxa.h b/source/sound/cdxa.h index 149c320a1..1c9ee0f2d 100644 --- a/source/sound/cdxa.h +++ b/source/sound/cdxa.h @@ -44,7 +44,7 @@ public: enum XA_ENUM { XA_MUSIC_TRACK =1, - XA_SPEECH_TRACK =2, + XA_SPEECH_TRACK =1, XA_QUEUE_MAX =8, XA_TRACK_MAX =32, XA_DEFAULT_VOL =32000, diff --git a/source/sound/speech.h b/source/sound/speech.h index 4abc6ddb3..b8d2ced61 100644 --- a/source/sound/speech.h +++ b/source/sound/speech.h @@ -3,4 +3,11 @@ typedef u32 SpeechEquate; +#include "sound\Bank0_Speech.h" +#include "sound\Bank1_Speech.h" +#include "sound\Bank2_Speech.h" +#include "sound\Bank3_Speech.h" +#include "sound\Bank4_Speech.h" +#include "sound\Bank5_Speech.h" + #endif diff --git a/tools/MkSpeech.exe b/tools/MkSpeech.exe index f9870a28e..ee4e54861 100644 Binary files a/tools/MkSpeech.exe and b/tools/MkSpeech.exe differ