diff options
| author | strangerke | 2011-04-02 18:06:53 +0200 |
|---|---|---|
| committer | strangerke | 2011-04-02 18:06:53 +0200 |
| commit | 753dcda5036223211824332c903d5feec0988ddc (patch) | |
| tree | fbf586749d43d27bb6bb05d52c0ae77c58898448 /engines/tsage/resources.cpp | |
| parent | 80f51e5768db35c4ce3b379bc240e43bf1c36532 (diff) | |
| parent | 499d1751c747fb481c9390513a2ec90653af852f (diff) | |
| download | scummvm-rg350-753dcda5036223211824332c903d5feec0988ddc.tar.gz scummvm-rg350-753dcda5036223211824332c903d5feec0988ddc.tar.bz2 scummvm-rg350-753dcda5036223211824332c903d5feec0988ddc.zip | |
Merge branch 'tsage' of http://github.com/dreammaster/scummvm
Conflicts:
engines/tsage/module.mk
engines/tsage/ringworld_logic.cpp
Diffstat (limited to 'engines/tsage/resources.cpp')
| -rw-r--r-- | engines/tsage/resources.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/tsage/resources.cpp b/engines/tsage/resources.cpp index 2df4b54b94..74e9183cf5 100644 --- a/engines/tsage/resources.cpp +++ b/engines/tsage/resources.cpp @@ -183,7 +183,7 @@ void RlbManager::loadSection(uint32 fileOffset) { re->fileOffset = offset; re->isCompressed = type != 0; re->size = ((sizeHi & 0xF) << 16) | size; - re->uncompressedSize = ((sizeHi & 0xF) << 16) | uncSize; + re->uncompressedSize = ((sizeHi & 0xF0) << 12) | uncSize; _resources.push_back(*re); } |