diff options
| author | Sven Hesse | 2014-05-26 16:38:45 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-09-29 22:33:33 +0200 |
| commit | ff1df93e9d6b16d2d3eab0933a3019a80fb00abb (patch) | |
| tree | 39e04770502319bfcccf264c09fde13ae99ac3cf | |
| parent | 76cfb2c8a9fbdc56dfcdca9d1fcfe82eac0ba9ee (diff) | |
| download | scummvm-rg350-ff1df93e9d6b16d2d3eab0933a3019a80fb00abb.tar.gz scummvm-rg350-ff1df93e9d6b16d2d3eab0933a3019a80fb00abb.tar.bz2 scummvm-rg350-ff1df93e9d6b16d2d3eab0933a3019a80fb00abb.zip | |
BLADERUNNER: Rename _vptr to _vpointer
_vptr is a reserved keyword!
| -rw-r--r-- | engines/bladerunner/vqa_decoder.cpp | 20 | ||||
| -rw-r--r-- | engines/bladerunner/vqa_decoder.h | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/engines/bladerunner/vqa_decoder.cpp b/engines/bladerunner/vqa_decoder.cpp index 4f484caf4b..04c313735f 100644 --- a/engines/bladerunner/vqa_decoder.cpp +++ b/engines/bladerunner/vqa_decoder.cpp @@ -544,8 +544,8 @@ VQADecoder::VQAVideoTrack::VQAVideoTrack(VQADecoder *vqaDecoder) { _cbfz = nullptr; _zbufChunk = nullptr; - _vptrSize = 0; - _vptr = nullptr; + _vpointerSize = 0; + _vpointer = nullptr; _curFrame = -1; @@ -560,7 +560,7 @@ VQADecoder::VQAVideoTrack::~VQAVideoTrack() { delete[] _codebook; delete[] _cbfz; delete[] _zbufChunk; - delete[] _vptr; + delete[] _vpointer; delete _surface; } @@ -773,11 +773,11 @@ bool VQADecoder::VQAVideoTrack::readVPTR(Common::SeekableReadStream *s, uint32 s if (size > _maxVPTRSize) return false; - if (!_vptr) - _vptr = new uint8[roundup(_maxVPTRSize)]; + if (!_vpointer) + _vpointer = new uint8[roundup(_maxVPTRSize)]; - _vptrSize = size; - s->read(_vptr, roundup(size)); + _vpointerSize = size; + s->read(_vpointer, roundup(size)); _hasNewFrame = true; @@ -829,11 +829,11 @@ void VQADecoder::VQAVideoTrack::VPTRWriteBlock(uint16 *frame, unsigned int dstBl bool VQADecoder::VQAVideoTrack::decodeFrame(uint16 *frame) { - if (!_codebook || !_vptr) + if (!_codebook || !_vpointer) return false; - uint8 *src = _vptr; - uint8 *end = _vptr + _vptrSize; + uint8 *src = _vpointer; + uint8 *end = _vpointer + _vpointerSize; uint16 count, srcBlock, dstBlock = 0; (void)srcBlock; diff --git a/engines/bladerunner/vqa_decoder.h b/engines/bladerunner/vqa_decoder.h index d07d73f0f8..110ca704c5 100644 --- a/engines/bladerunner/vqa_decoder.h +++ b/engines/bladerunner/vqa_decoder.h @@ -189,8 +189,8 @@ private: uint8 *_cbfz; uint8 *_zbufChunk; - uint32 _vptrSize; - uint8 *_vptr; + uint32 _vpointerSize; + uint8 *_vpointer; int _curFrame; |