diff options
author | Peter Kohaut | 2017-03-29 18:47:38 +0200 |
---|---|---|
committer | Peter Kohaut | 2017-03-29 18:48:46 +0200 |
commit | 5f36e65855458a7f146621d99ab09aa049cc6916 (patch) | |
tree | ea66de80170f133b7b34f157e0f4cddf0dd8c6e6 /engines/bladerunner/zbuffer.cpp | |
parent | d4ff2ddf1073e13f42be8fd2918a83d198a8b00c (diff) | |
download | scummvm-rg350-5f36e65855458a7f146621d99ab09aa049cc6916.tar.gz scummvm-rg350-5f36e65855458a7f146621d99ab09aa049cc6916.tar.bz2 scummvm-rg350-5f36e65855458a7f146621d99ab09aa049cc6916.zip |
BLADERUNNER: zbuffer is now updated between scene changes
updated vqa player udpate code
fixed some warnings
audio preloading still needs some work
Diffstat (limited to 'engines/bladerunner/zbuffer.cpp')
-rw-r--r-- | engines/bladerunner/zbuffer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/bladerunner/zbuffer.cpp b/engines/bladerunner/zbuffer.cpp index 76391f009f..3f2ed9abcc 100644 --- a/engines/bladerunner/zbuffer.cpp +++ b/engines/bladerunner/zbuffer.cpp @@ -93,9 +93,9 @@ static int decodePartialZBuffer(const uint8 *src, uint16 *curZBUF, uint32 srcLen uint32 dstRemain = dstSize; uint16 *curzp = curZBUF; - uint16 *inp = (uint16*)src; + const uint16 *inp = (const uint16*)src; - while (dstRemain && (inp - (uint16*)src) < (std::ptrdiff_t)srcLen) { + while (dstRemain && (inp - (const uint16*)src) < (std::ptrdiff_t)srcLen) { uint32 count = FROM_LE_16(*inp++); if (count & 0x8000) { @@ -129,12 +129,12 @@ bool ZBuffer::decodeData(const uint8 *data, int size) { return false; } - uint32 width, height, complete, unk0; + uint32 width, height, complete;// , unk0; width = READ_LE_UINT32(data + 0); height = READ_LE_UINT32(data + 4); complete = READ_LE_UINT32(data + 8); - unk0 = READ_LE_UINT32(data + 12); + /*unk0 =*/ READ_LE_UINT32(data + 12); if (width != (uint32)_width || height != (uint32)_height) { warning("zbuffer size mismatch (%d, %d) != (%d, %d)", _width, _height, width, height); |