diff options
| author | Joost Peters | 2003-08-27 00:48:55 +0000 |
|---|---|---|
| committer | Joost Peters | 2003-08-27 00:48:55 +0000 |
| commit | 69693575051c7495f1dac23fd8f2b8e81a8f5262 (patch) | |
| tree | 2aaed62f54ef6d5a84a0122360054f9179d004c3 | |
| parent | 3443c5c3d0c9fda270ab9e2ec3c5eeed98522a60 (diff) | |
| download | scummvm-rg350-69693575051c7495f1dac23fd8f2b8e81a8f5262.tar.gz scummvm-rg350-69693575051c7495f1dac23fd8f2b8e81a8f5262.tar.bz2 scummvm-rg350-69693575051c7495f1dac23fd8f2b8e81a8f5262.zip | |
errr. this shouldn't have been committed
svn-id: r9872
| -rw-r--r-- | sword2/driver/d_sound.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
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++) |