aboutsummaryrefslogtreecommitdiff
path: root/engines/cine/unpack.cpp
diff options
context:
space:
mode:
authorKari Salminen2008-06-13 08:37:03 +0000
committerKari Salminen2008-06-13 08:37:03 +0000
commit2b94f217449374289444f6d37ed0e676a6e80098 (patch)
tree7792af5e5a82912982fa185cc5d1a46373b207e6 /engines/cine/unpack.cpp
parent1a6841c92f78e18e489cb8bdca7caf6d7ddfa974 (diff)
downloadscummvm-rg350-2b94f217449374289444f6d37ed0e676a6e80098.tar.gz
scummvm-rg350-2b94f217449374289444f6d37ed0e676a6e80098.tar.bz2
scummvm-rg350-2b94f217449374289444f6d37ed0e676a6e80098.zip
Small cleanup (uint16 -> uint where still applicable).
svn-id: r32689
Diffstat (limited to 'engines/cine/unpack.cpp')
-rw-r--r--engines/cine/unpack.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/cine/unpack.cpp b/engines/cine/unpack.cpp
index 6c14b1980b..dcd3181242 100644
--- a/engines/cine/unpack.cpp
+++ b/engines/cine/unpack.cpp
@@ -120,25 +120,25 @@ bool CineUnpacker::unpack(const byte *src, uint srcLen, byte *dst, uint dstLen)
*/
if (!nextBit()) { // 0...
if (!nextBit()) { // 0 0
- uint16 numBytes = getBits(3) + 1;
+ uint numBytes = getBits(3) + 1;
unpackRawBytes(numBytes);
} else { // 0 1
- uint16 numBytes = 2;
- uint16 offset = getBits(8);
+ uint numBytes = 2;
+ uint offset = getBits(8);
copyRelocatedBytes(offset, numBytes);
}
} else { // 1...
- uint16 c = getBits(2);
+ uint c = getBits(2);
if (c == 3) { // 1 1 1
- uint16 numBytes = getBits(8) + 9;
+ uint numBytes = getBits(8) + 9;
unpackRawBytes(numBytes);
} else if (c < 2) { // 1 0 x
- uint16 numBytes = c + 3;
- uint16 offset = getBits(c + 9);
+ uint numBytes = c + 3;
+ uint offset = getBits(c + 9);
copyRelocatedBytes(offset, numBytes);
} else { // 1 1 0
- uint16 numBytes = getBits(8) + 1;
- uint16 offset = getBits(12);
+ uint numBytes = getBits(8) + 1;
+ uint offset = getBits(12);
copyRelocatedBytes(offset, numBytes);
}
}