[Scummvm-git-logs] scummvm master -> 307321ec20befe32cd254497f62b6ab0dcbcaf83

[madmoose]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
307321ec20 BLADERUNNER: Fix invalid assert in AudStream


Commit: 307321ec20befe32cd254497f62b6ab0dcbcaf83
    https://github.com/scummvm/scummvm/commit/307321ec20befe32cd254497f62b6ab0dcbcaf83
Author: Thomas Fach-Pedersen (thomas at fach-pedersen.net)
Date: 2016-10-22T20:24:57+02:00

Commit Message:
BLADERUNNER: Fix invalid assert in AudStream

Changed paths:
    engines/bladerunner/aud_stream.cpp



diff --git a/engines/bladerunner/aud_stream.cpp b/engines/bladerunner/aud_stream.cpp
index 1ff54e0..e859b33 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;
 			}