aboutsummaryrefslogtreecommitdiff
path: root/sword2
diff options
context:
space:
mode:
authorTorbjörn Andersson2005-10-17 06:31:10 +0000
committerTorbjörn Andersson2005-10-17 06:31:10 +0000
commit1a717471ba30aabff6bf442666676a8ad2dbce16 (patch)
tree40e69f85b807c555c841493568a13a1306d0ce2b /sword2
parentee4cbcb98db2087627e597eea6d61afeab8e23b1 (diff)
downloadscummvm-rg350-1a717471ba30aabff6bf442666676a8ad2dbce16.tar.gz
scummvm-rg350-1a717471ba30aabff6bf442666676a8ad2dbce16.tar.bz2
scummvm-rg350-1a717471ba30aabff6bf442666676a8ad2dbce16.zip
Fixed off-by-one error when decoding the original sound files. I thought I
had already done this, but I guess not... svn-id: r19126
Diffstat (limited to 'sword2')
-rw-r--r--sword2/driver/d_sound.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp
index a0cd17d116..405bfadd32 100644
--- a/sword2/driver/d_sound.cpp
+++ b/sword2/driver/d_sound.cpp
@@ -107,9 +107,10 @@ static AudioStream *getAudioStream(SoundFileHandle *fh, const char *base, int cd
for (uint32 cnt = 0; cnt < fh->idxLen; cnt++) {
fh->idxTab[cnt * 3 + 0] = fh->file->readUint32LE();
fh->idxTab[cnt * 3 + 1] = fh->file->readUint32LE();
- if (fh->fileType == kCLUMode)
+ if (fh->fileType == kCLUMode) {
fh->idxTab[cnt * 3 + 2] = fh->idxTab[cnt * 3 + 1];
- else
+ fh->idxTab[cnt * 3 + 1]--;
+ } else
fh->idxTab[cnt * 3 + 2] = fh->file->readUint32LE();
}
}
@@ -296,7 +297,7 @@ void MusicInputStream::refill() {
len_left = _samplesLeft;
if (!_looping) {
- // None-looping music is faded out at the end. If this fade
+ // Non-looping music is faded out at the end. If this fade
// out would have started somewhere within the len_left samples
// to read, we only read up to that point. This way, we can
// treat this fade as any other.