From 69693575051c7495f1dac23fd8f2b8e81a8f5262 Mon Sep 17 00:00:00 2001 From: Joost Peters Date: Wed, 27 Aug 2003 00:48:55 +0000 Subject: errr. this shouldn't have been committed svn-id: r9872 --- sword2/driver/d_sound.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'sword2') diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp index f4df127b61..8f2773b63e 100644 --- a/sword2/driver/d_sound.cpp +++ b/sword2/driver/d_sound.cpp @@ -992,11 +992,9 @@ int32 Sword2Sound::PlayCompSpeech(const char *filename, uint32 speechid, uint8 v // Open the speech cluster and find the data offset & size fp = fopen(filename, "rb"); - if (fp == NULL) { - error("PlayCompSpeech()"); + if (fp == NULL) return(RDERR_INVALIDFILENAME); - } - + if (fseek(fp, (++speechid) * 8, SEEK_SET)) { fclose(fp); @@ -1116,7 +1114,7 @@ int32 Sword2Sound::PlayCompSpeech(const char *filename, uint32 speechid, uint8 v // IDirectSoundBuffer_Play(dsbSpeech, 0, 0, 0); uint32 flags = SoundMixer::FLAG_16BITS; - flags |= SoundMixer::FLAG_AUTOFREE; + flags |= SoundMixer::FLAG_AUTOFREE; //Until the mixer supports LE samples natively, we need to convert our LE ones to BE for (uint j = 0; j < (bufferSize / 2); j++) -- cgit v1.2.3