aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2009-02-01 22:21:57 +0000
committerFilippos Karapetis2009-02-01 22:21:57 +0000
commitdd39274391c3d6ed5eea1e3526f905a4908337db (patch)
tree96cc722601e627cc3d9881314d02ad53e476fbe3
parent71b4f84c4688abc6588eea0676fc53f25a36a144 (diff)
downloadscummvm-rg350-dd39274391c3d6ed5eea1e3526f905a4908337db.tar.gz
scummvm-rg350-dd39274391c3d6ed5eea1e3526f905a4908337db.tar.bz2
scummvm-rg350-dd39274391c3d6ed5eea1e3526f905a4908337db.zip
Fixed regression in the ADPCM decoder. DW2 music should be played correctly again
svn-id: r36195
-rw-r--r--sound/adpcm.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/adpcm.cpp b/sound/adpcm.cpp
index 60345c4fe2..6bb2c8c0e4 100644
--- a/sound/adpcm.cpp
+++ b/sound/adpcm.cpp
@@ -134,7 +134,8 @@ ADPCMInputStream::ADPCMInputStream(Common::SeekableReadStream *stream, bool disp
_startpos = stream->pos();
_endpos = _startpos + size;
- _curLoop = 0;
+ _curLoop = 0;
+ _blockPos = 0;
reset();
}
@@ -148,7 +149,6 @@ void ADPCMInputStream::reset() {
_blockLen = 0;
_blockPos = _blockAlign; // To make sure first header is read
_chunkPos = 0;
- _blockPos = 0;
}
int ADPCMInputStream::readBuffer(int16 *buffer, const int numSamples) {