aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/resource_intern.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2009-01-01 15:06:43 +0000
committerEugene Sandulenko2009-01-01 15:06:43 +0000
commit696897b0583ad52ebc6f7666525277847619a8ce (patch)
tree5ac2be2991e94dce32c5bb7fdb0dcc4188221503 /engines/kyra/resource_intern.cpp
parent05d3633eb32ead8e11435b85a9db1ddaa1482fcb (diff)
downloadscummvm-rg350-696897b0583ad52ebc6f7666525277847619a8ce.tar.gz
scummvm-rg350-696897b0583ad52ebc6f7666525277847619a8ce.tar.bz2
scummvm-rg350-696897b0583ad52ebc6f7666525277847619a8ce.zip
Whoa! Removing trailing spaces.
svn-id: r35648
Diffstat (limited to 'engines/kyra/resource_intern.cpp')
-rw-r--r--engines/kyra/resource_intern.cpp52
1 files changed, 26 insertions, 26 deletions
diff --git a/engines/kyra/resource_intern.cpp b/engines/kyra/resource_intern.cpp
index 827af4892f..ebe874ae2f 100644
--- a/engines/kyra/resource_intern.cpp
+++ b/engines/kyra/resource_intern.cpp
@@ -212,7 +212,7 @@ struct PlainArchiveListSearch {
Common::Archive *ResLoaderPak::load(Common::SharedPtr<Common::ArchiveMember> memberFile, Common::SeekableReadStream &stream) const {
int32 filesize = stream.size();
-
+
int32 startoffset = 0, endoffset = 0;
bool switchEndian = false;
bool firstFile = true;
@@ -400,7 +400,7 @@ bool ResLoaderTlk::isLoadable(const Common::String &filename, Common::SeekableRe
Common::Archive *ResLoaderTlk::load(Common::SharedPtr<Common::ArchiveMember> file, Common::SeekableReadStream &stream) const {
uint16 entries = stream.readUint16LE();
PlainArchive::FileInputList files;
-
+
for (uint i = 0; i < entries; ++i) {
PlainArchive::InputEntry entry;
@@ -451,7 +451,7 @@ private:
};
void FileExpanderSource::advSrcBitsBy1() {
- _key >>= 1;
+ _key >>= 1;
if (!--_bitsLeft) {
if (_dataPtr < _endofBuffer)
_key = ((*_dataPtr++) << 8 ) | (_key & 0xff);
@@ -479,7 +479,7 @@ uint16 FileExpanderSource::getKeyMasked(uint8 newIndex) {
if (_index > 8) {
newIndex = _index - 8;
- res = (_key & 0xff) & mskTable[8];
+ res = (_key & 0xff) & mskTable[8];
advSrcBitsByIndex(8);
_index = newIndex;
res |= (((_key & 0xff) & mskTable[_index]) << 8);
@@ -518,7 +518,7 @@ uint16 FileExpanderSource::keyMaskedAlign(uint16 val) {
void FileExpanderSource::advSrcRefresh() {
_key = READ_LE_UINT16(_dataPtr);
if (_dataPtr < _endofBuffer - 1)
- _dataPtr += 2;
+ _dataPtr += 2;
_bitsLeft = 8;
}
@@ -566,7 +566,7 @@ bool FileExpander::process(uint8 *dst, const uint8 *src, uint32 outsize, uint32
0x10, 0x11, 0x12, 0x00, 0x08, 0x07, 0x09, 0x06, 0x0A,
0x05, 0x0B, 0x04, 0x0C, 0x03, 0x0D, 0x02, 0x0E, 0x01, 0x0F
};
-
+
memset(_tables[0], 0, 3914);
uint8 *d = dst;
@@ -591,10 +591,10 @@ bool FileExpander::process(uint8 *dst, const uint8 *src, uint32 outsize, uint32
tableSize0 = _src->getKeyMasked(5) + 257;
tableSize1 = _src->getKeyMasked(5) + 1;
memset(_tables[7], 0, 19);
-
+
const uint8 *itbl = indexTable;
int numbytes = _src->getKeyMasked(4) + 4;
-
+
while (numbytes--)
_tables[7][*itbl++] = _src->getKeyMasked(3);
@@ -615,7 +615,7 @@ bool FileExpander::process(uint8 *dst, const uint8 *src, uint32 outsize, uint32
uint8 tmpI = 0;
if (cmd == 16) {
cmd = _src->getKeyMasked(2) + 3;
- tmpI = *(tmp - 1);
+ tmpI = *(tmp - 1);
} else if (cmd == 17) {
cmd = _src->getKeyMasked(3) + 3;
} else {
@@ -630,7 +630,7 @@ bool FileExpander::process(uint8 *dst, const uint8 *src, uint32 outsize, uint32
error("decompression failure");
}
}
-
+
memcpy(_tables[1], _tables[0] + tableSize0, tableSize1);
generateTables(0, 2, 3, tableSize0);
generateTables(1, 4, 5, tableSize1);
@@ -640,7 +640,7 @@ bool FileExpander::process(uint8 *dst, const uint8 *src, uint32 outsize, uint32
postprocess = false;
needrefresh = true;
} else if (mode == 0){
- uint8 *d2 = _tables[0];
+ uint8 *d2 = _tables[0];
memset(d2, 8, 144);
memset(d2 + 144, 9, 112);
memset(d2 + 256, 7, 24);
@@ -659,9 +659,9 @@ bool FileExpander::process(uint8 *dst, const uint8 *src, uint32 outsize, uint32
if (!postprocess)
continue;
-
+
int16 cmd = 0;
-
+
do {
cmd = ((int16*) _tables[2])[_src->getKeyLower()];
_src->advSrcBitsByIndex(cmd < 0 ? calcCmdAndIndex(_tables[3], cmd) : _tables[0][cmd]);
@@ -721,8 +721,8 @@ void FileExpander::generateTables(uint8 srcIndex, uint8 dstIndex, uint8 dstIndex
const uint8 *s = tbl1;
memset(_tables16[0], 0, 32);
-
- for (int i = 0; i < cnt; i++)
+
+ for (int i = 0; i < cnt; i++)
_tables16[0][(*s++)]++;
_tables16[1][1] = 0;
@@ -758,12 +758,12 @@ void FileExpander::generateTables(uint8 srcIndex, uint8 dstIndex, uint8 dstIndex
if (t > 0) {
uint16 v1 = *d;
uint16 v2 = 0;
-
+
do {
v2 = (v2 << 1) | (v1 & 1);
v1 >>= 1;
} while (--t && v1);
-
+
t++;
uint8 c1 = (v1 & 1);
while (t--) {
@@ -775,7 +775,7 @@ void FileExpander::generateTables(uint8 srcIndex, uint8 dstIndex, uint8 dstIndex
*d++ = v2;
} else {
d++;
- }
+ }
}
memset(tbl2, 0, 512);
@@ -794,7 +794,7 @@ void FileExpander::generateTables(uint8 srcIndex, uint8 dstIndex, uint8 dstIndex
if (t && t < 9) {
inc = 1 << t;
uint16 o = *d;
-
+
do {
s2[o] = cnt;
o += inc;
@@ -824,7 +824,7 @@ void FileExpander::generateTables(uint8 srcIndex, uint8 dstIndex, uint8 dstIndex
} while (--t);
*s2 = cnt;
}
- d--;
+ d--;
} while (--cnt >= 0);
}
@@ -909,7 +909,7 @@ Common::Archive *InstallerLoader::load(Resource *owner, const Common::String &fi
delete tmpFile;
tmpFile = 0;
-
+
pos += cs;
if (cs == size) {
if (!bytesleft) {
@@ -960,7 +960,7 @@ Common::Archive *InstallerLoader::load(Resource *owner, const Common::String &fi
}
uint32 size = (i == a->lastFile) ? a->endOffset : tmpFile->size();
-
+
if (startFile) {
startFile = false;
pos = a->startOffset + kExecSize;
@@ -1009,7 +1009,7 @@ Common::Archive *InstallerLoader::load(Resource *owner, const Common::String &fi
tmpFile->seek(pos, SEEK_SET);
}
}
-
+
sprintf(filenameExt, extension.c_str(), i + 1);
filenameTemp = a->filename + Common::String(filenameExt);
@@ -1022,12 +1022,12 @@ Common::Archive *InstallerLoader::load(Resource *owner, const Common::String &fi
}
uint32 id = READ_LE_UINT32(hdr);
-
+
if (id == 0x04034B50) {
compressionType = hdr[8];
insize = READ_LE_UINT32(hdr + 18);
outsize = READ_LE_UINT32(hdr + 22);
-
+
uint16 filestrlen = READ_LE_UINT16(hdr + 26);
*(hdr + 30 + filestrlen) = 0;
entryStr = Common::String((const char *)(hdr + 30));
@@ -1047,7 +1047,7 @@ Common::Archive *InstallerLoader::load(Resource *owner, const Common::String &fi
if ((pos + insize) > size) {
// this is for files that are split between two archive files
inPart1 = size - pos;
- inPart2 = insize - inPart1;
+ inPart2 = insize - inPart1;
tmpFile->read(inbuffer, inPart1);
} else {
tmpFile->read(inbuffer, insize);