aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPeter Kohaut2016-09-30 23:58:20 +0200
committerPeter Kohaut2016-09-30 23:58:20 +0200
commit70c10f82430fcf9e8d523075563760b889c3bb83 (patch)
treeaf2e7952bf2302345a17ef6547efe4441d1b31bd /engines
parent0c7d323921baa36f0a6db4b81e906ff402509463 (diff)
downloadscummvm-rg350-70c10f82430fcf9e8d523075563760b889c3bb83.tar.gz
scummvm-rg350-70c10f82430fcf9e8d523075563760b889c3bb83.tar.bz2
scummvm-rg350-70c10f82430fcf9e8d523075563760b889c3bb83.zip
BLADERUNNER: fixed compiler error in gcc and clang (was working in msvc14)
Diffstat (limited to 'engines')
-rw-r--r--engines/bladerunner/aud_stream.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/bladerunner/aud_stream.cpp b/engines/bladerunner/aud_stream.cpp
index 4eadb5baf6..e86f6d5096 100644
--- a/engines/bladerunner/aud_stream.cpp
+++ b/engines/bladerunner/aud_stream.cpp
@@ -95,7 +95,7 @@ int AudStream::readBuffer(int16 *buffer, const int numSamples) {
samplesRead += 2 * bytesConsumed;
}
} else {
- int bytesToCopy = MIN(2 * numSamples, _end - _p);
+ int bytesToCopy = MIN(2 * numSamples, (int)(_end - _p));
memcpy(buffer, _p, bytesToCopy);
_p += bytesToCopy;
samplesRead = bytesToCopy / 2;