diff options
| author | Norbert Lange | 2009-08-11 22:35:56 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-08-11 22:35:56 +0000 |
| commit | 0836cf6d9b9222255273a9c6f9d91203b13c3bd9 (patch) | |
| tree | 714c59161aaf7dbc36d7cb6b4e8fcaa9c467e8f9 /sound | |
| parent | 8cb42dd6896925106282abd23ce23812d6031989 (diff) | |
| parent | 65e9ae163ff757ca15af78da4a753a7ee1d25a16 (diff) | |
| download | scummvm-rg350-0836cf6d9b9222255273a9c6f9d91203b13c3bd9.tar.gz scummvm-rg350-0836cf6d9b9222255273a9c6f9d91203b13c3bd9.tar.bz2 scummvm-rg350-0836cf6d9b9222255273a9c6f9d91203b13c3bd9.zip | |
merged from trunk (Amiga LoK supposedly completeable!)
fixed a bug I introduced in one of the last cleanups
svn-id: r43291
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/adpcm.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/adpcm.cpp b/sound/adpcm.cpp index 37b14140b7..5cf1171fcb 100644 --- a/sound/adpcm.cpp +++ b/sound/adpcm.cpp @@ -302,11 +302,13 @@ int ADPCMInputStream::readBufferMS(int channels, int16 *buffer, const int numSam for (i = 0; i < channels; i++) _status.ch[i].sample1 = _stream->readSint16LE(); - for (i = 0; i < channels; i++) - buffer[samples++] = _status.ch[i].sample2 = _stream->readSint16LE(); + for (i = 0; i < channels; i++) { + _status.ch[i].sample2 = _stream->readSint16LE(); + buffer[samples++] = TO_LE_16(_status.ch[i].sample2); + } for (i = 0; i < channels; i++) - buffer[samples++] = _status.ch[i].sample1; + buffer[samples++] = TO_LE_16(_status.ch[i].sample1); _blockPos = channels * 7; } |