diff options
author | richiesams | 2013-07-15 10:36:24 -0500 |
---|---|---|
committer | richiesams | 2013-08-04 13:32:19 -0500 |
commit | 8de12fcbd2dbfddd45bd7916e1e90b5b3e4466bc (patch) | |
tree | 483fff99be9a953c4aa6fb5283fd60f39af455a0 /engines | |
parent | 644313e8f20fa777325c748a450ca698141c0d97 (diff) | |
download | scummvm-rg350-8de12fcbd2dbfddd45bd7916e1e90b5b3e4466bc.tar.gz scummvm-rg350-8de12fcbd2dbfddd45bd7916e1e90b5b3e4466bc.tar.bz2 scummvm-rg350-8de12fcbd2dbfddd45bd7916e1e90b5b3e4466bc.zip |
ZVISION: Add underscore prefix to public static variable names
Diffstat (limited to 'engines')
-rw-r--r-- | engines/zvision/lzss_read_stream.cpp | 8 | ||||
-rw-r--r-- | engines/zvision/lzss_read_stream.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/engines/zvision/lzss_read_stream.cpp b/engines/zvision/lzss_read_stream.cpp index a7cdcd9d88..2d7acdb8ce 100644 --- a/engines/zvision/lzss_read_stream.cpp +++ b/engines/zvision/lzss_read_stream.cpp @@ -33,17 +33,17 @@ LzssReadStream::LzssReadStream(Common::SeekableReadStream *source, bool stream, _readCursor(0), _eosFlag(false) { // Clear the window to null - memset(_window, 0, blockSize); + memset(_window, 0, _blockSize); // Reserve space in the destination buffer // TODO: Make a better guess - if (decompressedSize == npos) { + if (decompressedSize == _npos) { decompressedSize = source->size(); } _destination.reserve(decompressedSize); if (stream) - decompressBytes(blockSize); + decompressBytes(_blockSize); else decompressAll(); } @@ -120,7 +120,7 @@ uint32 LzssReadStream::read(void *dataPtr, uint32 dataSize) { break; } - decompressBytes(blockSize); + decompressBytes(_blockSize); } if (dataSize > 0) { diff --git a/engines/zvision/lzss_read_stream.h b/engines/zvision/lzss_read_stream.h index 9ef1d6da37..142bf9e1a2 100644 --- a/engines/zvision/lzss_read_stream.h +++ b/engines/zvision/lzss_read_stream.h @@ -41,16 +41,16 @@ public: * @param stream Decompress the data as needed (true) or all at once (false) * @param decompressedSize The size of the decompressed data. If npos, the class will choose a size and grow as needed */ - LzssReadStream(Common::SeekableReadStream *source, bool stream = true, uint32 decompressedSize = npos); + LzssReadStream(Common::SeekableReadStream *source, bool stream = true, uint32 decompressedSize = _npos); public: - static const uint32 npos = 0xFFFFFFFFu; - static const uint16 blockSize = 0x1000u; + static const uint32 _npos = 0xFFFFFFFFu; + static const uint16 _blockSize = 0x1000u; private: Common::SeekableReadStream *_source; Common::Array<char> _destination; - char _window[blockSize]; + char _window[_blockSize]; uint16 _windowCursor; uint32 _readCursor; bool _eosFlag; |