From 8de12fcbd2dbfddd45bd7916e1e90b5b3e4466bc Mon Sep 17 00:00:00 2001 From: richiesams Date: Mon, 15 Jul 2013 10:36:24 -0500 Subject: ZVISION: Add underscore prefix to public static variable names --- engines/zvision/lzss_read_stream.cpp | 8 ++++---- engines/zvision/lzss_read_stream.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'engines') 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 _destination; - char _window[blockSize]; + char _window[_blockSize]; uint16 _windowCursor; uint32 _readCursor; bool _eosFlag; -- cgit v1.2.3