aboutsummaryrefslogtreecommitdiff
path: root/engines/bladerunner/vqa_decoder.cpp
diff options
context:
space:
mode:
authorThomas Fach-Pedersen2014-05-25 15:01:06 +0200
committerEugene Sandulenko2016-09-29 22:33:28 +0200
commit5cb4ba9a9b52705d84e30b07de1badb780e4b02e (patch)
tree51c336bfea4bdf11d9a07105ac7a1ef72846b9b3 /engines/bladerunner/vqa_decoder.cpp
parentd260f993aad56cf699d8ba298c84e603650edf8f (diff)
downloadscummvm-rg350-5cb4ba9a9b52705d84e30b07de1badb780e4b02e.tar.gz
scummvm-rg350-5cb4ba9a9b52705d84e30b07de1badb780e4b02e.tar.bz2
scummvm-rg350-5cb4ba9a9b52705d84e30b07de1badb780e4b02e.zip
BLADERUNNER: Add basic Scene, Set, and Script support.
Diffstat (limited to 'engines/bladerunner/vqa_decoder.cpp')
-rw-r--r--engines/bladerunner/vqa_decoder.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/bladerunner/vqa_decoder.cpp b/engines/bladerunner/vqa_decoder.cpp
index d97c1d8c46..4f484caf4b 100644
--- a/engines/bladerunner/vqa_decoder.cpp
+++ b/engines/bladerunner/vqa_decoder.cpp
@@ -295,9 +295,11 @@ bool VQADecoder::readVQHD(Common::SeekableReadStream *s, uint32 size)
}
assert(_header.version == 2);
- assert(_header.freq == 22050);
- assert(_header.channels == 1);
- assert(_header.bits == 16);
+ if (_header.channels != 0) {
+ assert(_header.freq == 22050);
+ assert(_header.channels == 1);
+ assert(_header.bits == 16);
+ }
assert(_header.colors == 0);
return true;
@@ -497,9 +499,11 @@ bool VQADecoder::readLNIN(Common::SeekableReadStream *s, uint32 size)
for (int i = 0; i != loopNamesCount; ++i) {
char *begin = names + loopNameOffsets[i];
- uint32 len = ((i == loopNamesCount) ? chd.size : loopNameOffsets[i+1]) - loopNameOffsets[i];
+ uint32 len = ((i == loopNamesCount - 1) ? chd.size : loopNameOffsets[i+1]) - loopNameOffsets[i];
_loopInfo.loops[i].name = Common::String(begin, len);
+
+ // debug("%2d: %s", i, _loopInfo.loops[i].name.c_str());
}
return true;