diff options
author | Thomas Fach-Pedersen | 2016-10-22 20:24:57 +0200 |
---|---|---|
committer | Thomas Fach-Pedersen | 2016-10-22 20:24:57 +0200 |
commit | 307321ec20befe32cd254497f62b6ab0dcbcaf83 (patch) | |
tree | e2c5702c9ae0c59a48d222bcf069a99ad918f817 | |
parent | 724385eb5e3154628a5e1655471d7cf4d67b7a70 (diff) | |
download | scummvm-rg350-307321ec20befe32cd254497f62b6ab0dcbcaf83.tar.gz scummvm-rg350-307321ec20befe32cd254497f62b6ab0dcbcaf83.tar.bz2 scummvm-rg350-307321ec20befe32cd254497f62b6ab0dcbcaf83.zip |
BLADERUNNER: Fix invalid assert in AudStream
-rw-r--r-- | engines/bladerunner/aud_stream.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/engines/bladerunner/aud_stream.cpp b/engines/bladerunner/aud_stream.cpp index 1ff54e05f1..e859b3347e 100644 --- a/engines/bladerunner/aud_stream.cpp +++ b/engines/bladerunner/aud_stream.cpp @@ -75,7 +75,14 @@ int AudStream::readBuffer(int16 *buffer, const int numSamples) { assert(sig == 0xdeaf); assert(_end - _p >= blockSize); - assert(blockOutSize == 4 * blockSize); + + // TODO: Previously we asserted that + // blockOutSize == 4 * blockSize, but + // occasionally, at the end of an AUD, + // we see blockOutSize == 4 * blockSize + 2 + // Investigate how BLADE.EXE handles this. + + assert(blockOutSize / 4 == blockSize); _deafBlockRemain = blockSize; } |