aboutsummaryrefslogtreecommitdiff
path: root/sky/rnc_deco.cpp
diff options
context:
space:
mode:
authorMax Horn2003-03-06 16:08:13 +0000
committerMax Horn2003-03-06 16:08:13 +0000
commit38e926cee3ec4a5066d41c0dc95231e156543b64 (patch)
treed9ff4414a40c5b151d750d921672aa4e3c50628a /sky/rnc_deco.cpp
parent730d528a543543f2c6ff3324c421b742eb8f1c4f (diff)
downloadscummvm-rg350-38e926cee3ec4a5066d41c0dc95231e156543b64.tar.gz
scummvm-rg350-38e926cee3ec4a5066d41c0dc95231e156543b64.tar.bz2
scummvm-rg350-38e926cee3ec4a5066d41c0dc95231e156543b64.zip
fixed shadowed variables (and the new name seems to be more appropriate anyway
svn-id: r6713
Diffstat (limited to 'sky/rnc_deco.cpp')
-rw-r--r--sky/rnc_deco.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/sky/rnc_deco.cpp b/sky/rnc_deco.cpp
index cd2503e0d4..541ba6f93f 100644
--- a/sky/rnc_deco.cpp
+++ b/sky/rnc_deco.cpp
@@ -249,12 +249,12 @@ int32 RncDecoder::unpackM1(void *input, void *output, uint16 key)
counts = inputBits(16);
for (;;) {
- uint32 inputBits = inputValue(_rawTable);
+ uint32 inputBytes = inputValue(_rawTable);
- if (inputBits) {
- memcpy(_dstPtr, _srcPtr, inputBits); //memcpy is allowed here
- _dstPtr += inputBits;
- _srcPtr += inputBits;
+ if (inputBytes) {
+ memcpy(_dstPtr, _srcPtr, inputBytes); //memcpy is allowed here
+ _dstPtr += inputBytes;
+ _srcPtr += inputBytes;
uint16 b = READ_LE_UINT16(_srcPtr);
uint16 a = ROL(b, _bitCount);
uint16 d = ((1 << _bitCount) - 1);