aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/decompress.cpp
diff options
context:
space:
mode:
authorStrangerke2015-05-07 19:33:44 +0200
committerStrangerke2015-05-07 19:33:44 +0200
commitd9e93f8e015ce27a95090e854494c4b3f7d1c0d4 (patch)
tree18e04f1670f0d944606f63264dd972b398dab4e9 /engines/sherlock/decompress.cpp
parenta0661c8d5a970791a6fac3e304fe975e8e61b5f9 (diff)
downloadscummvm-rg350-d9e93f8e015ce27a95090e854494c4b3f7d1c0d4.tar.gz
scummvm-rg350-d9e93f8e015ce27a95090e854494c4b3f7d1c0d4.tar.bz2
scummvm-rg350-d9e93f8e015ce27a95090e854494c4b3f7d1c0d4.zip
SHERLOCK: some code formatting
Diffstat (limited to 'engines/sherlock/decompress.cpp')
-rw-r--r--engines/sherlock/decompress.cpp78
1 files changed, 39 insertions, 39 deletions
diff --git a/engines/sherlock/decompress.cpp b/engines/sherlock/decompress.cpp
index 61110be840..b319bc90c8 100644
--- a/engines/sherlock/decompress.cpp
+++ b/engines/sherlock/decompress.cpp
@@ -36,47 +36,47 @@ Common::SeekableReadStream *decompressLZ(Common::SeekableReadStream &source, int
outSize = source.readSint32LE();
}
- byte lzWindow[4096];
- uint16 lzWindowPos;
- uint16 cmd;
-
- byte *outBuffer = new byte[outSize];
- byte *outBufferEnd = outBuffer + outSize;
- Common::MemoryReadStream *outS = new Common::MemoryReadStream(outBuffer, outSize, DisposeAfterUse::YES);
-
- memset(lzWindow, 0xFF, 0xFEE);
- lzWindowPos = 0xFEE;
- cmd = 0;
+ byte lzWindow[4096];
+ uint16 lzWindowPos;
+ uint16 cmd;
- while (1) {
- cmd >>= 1;
- if (!(cmd & 0x100)) {
- cmd = source.readByte() | 0xFF00;
- }
- if (cmd & 1) {
- byte literal = source.readByte();
- *outBuffer++ = literal;
- lzWindow[lzWindowPos] = literal;
- lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
- } else {
- int copyPos, copyLen;
- copyPos = source.readByte();
- copyLen = source.readByte();
- copyPos = copyPos | ((copyLen & 0xF0) << 4);
- copyLen = (copyLen & 0x0F) + 3;
- while (copyLen--) {
- byte literal = lzWindow[copyPos];
- copyPos = (copyPos + 1) & 0x0FFF;
- *outBuffer++ = literal;
- lzWindow[lzWindowPos] = literal;
- lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
- }
- }
- if (outBuffer >= outBufferEnd)
- break;
- }
+ byte *outBuffer = new byte[outSize];
+ byte *outBufferEnd = outBuffer + outSize;
+ Common::MemoryReadStream *outS = new Common::MemoryReadStream(outBuffer, outSize, DisposeAfterUse::YES);
- return outS;
+ memset(lzWindow, 0xFF, 0xFEE);
+ lzWindowPos = 0xFEE;
+ cmd = 0;
+
+ while (1) {
+ cmd >>= 1;
+ if (!(cmd & 0x100))
+ cmd = source.readByte() | 0xFF00;
+
+ if (cmd & 1) {
+ byte literal = source.readByte();
+ *outBuffer++ = literal;
+ lzWindow[lzWindowPos] = literal;
+ lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
+ } else {
+ int copyPos, copyLen;
+ copyPos = source.readByte();
+ copyLen = source.readByte();
+ copyPos = copyPos | ((copyLen & 0xF0) << 4);
+ copyLen = (copyLen & 0x0F) + 3;
+ while (copyLen--) {
+ byte literal = lzWindow[copyPos];
+ copyPos = (copyPos + 1) & 0x0FFF;
+ *outBuffer++ = literal;
+ lzWindow[lzWindowPos] = literal;
+ lzWindowPos = (lzWindowPos + 1) & 0x0FFF;
+ }
+ }
+ if (outBuffer >= outBufferEnd)
+ break;
+ }
+
+ return outS;
}
} // namespace Sherlock