Add support for speech in demo.

svn-id: r14350
This commit is contained in:
Travis Howell 2004-07-27 03:47:56 +00:00
parent bd88e98c9c
commit f734014fd2
2 changed files with 9 additions and 6 deletions

View File

@ -186,6 +186,12 @@ int16 *Sound::uncompressSpeech(uint32 index, uint32 cSize, uint32 *size) {
headerPos++;
if (headerPos < 100) {
uint32 resSize = READ_LE_UINT32(fBuf + headerPos + 4) >> 1;
// Demo uses slightly different headers
if (resSize > cSize) {
resSize = READ_LE_UINT32(fBuf + headerPos + 6) >> 1;
headerPos += 2;
}
int16 *srcData = (int16*)(fBuf + headerPos + 8);
int16 *dstData = (int16*)malloc(resSize * 2);
uint32 srcPos = 0;
@ -254,9 +260,10 @@ void Sound::initCowSystem(void) {
*/
sprintf(cowName, "SPEECH%d.CLU", SwordEngine::_systemVars.currentCD);
_cowFile.open(cowName);
if (!_cowFile.isOpen()) {
if (!_cowFile.isOpen())
_cowFile.open("speech.clu");
}
if (!_cowFile.isOpen())
_cowFile.open("cows.mad");
if (_cowFile.isOpen()) {
_cowHeaderSize = _cowFile.readUint32LE();
_cowHeader = (uint32*)malloc(_cowHeaderSize);

View File

@ -1066,10 +1066,6 @@ void SwordEngine::checkCdFiles(void) { // check if we're running from cd, hdd or
_systemVars.playSpeech = true;
return ;
} else {
const char msg[] = "SPEECH2.CLU not found.\nPlease copy the SPEECH.CLU from CD2 and rename it to SPEECH2.CLU";
GUI::MessageDialog dialog(msg);
dialog.runModal();
error(msg);
}
} else { // speech1.clu & speech2.clu not present. are we running from cd?
if (test.open("cd1.id")) {