diff options
| author | Max Horn | 2009-05-20 17:53:31 +0000 |
|---|---|---|
| committer | Max Horn | 2009-05-20 17:53:31 +0000 |
| commit | bba91075bf8820e062d3684c820c6aa9782b77a1 (patch) | |
| tree | cb75a05923ef525ebaa41a25f867cf80b3d78f9a /engines/sci/resource.cpp | |
| parent | 4f55f1e730fa50d354f47c3558d3d0aca68aa0a1 (diff) | |
| download | scummvm-rg350-bba91075bf8820e062d3684c820c6aa9782b77a1.tar.gz scummvm-rg350-bba91075bf8820e062d3684c820c6aa9782b77a1.tar.bz2 scummvm-rg350-bba91075bf8820e062d3684c820c6aa9782b77a1.zip | |
removed trailing whitespaces
svn-id: r40742
Diffstat (limited to 'engines/sci/resource.cpp')
| -rw-r--r-- | engines/sci/resource.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 0c63075a68..1d3d102688 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -748,8 +748,8 @@ int ResourceManager::detectVolVersion() { int chk = (curVersion == SCI_VERSION_0) ? 4 : 20; int offs = curVersion < SCI_VERSION_1_1 ? 4 : 0; - if ((curVersion < SCI_VERSION_32 && wCompression > chk) - || (curVersion == SCI_VERSION_32 && wCompression != 0 && wCompression != 32) + if ((curVersion < SCI_VERSION_32 && wCompression > chk) + || (curVersion == SCI_VERSION_32 && wCompression != 0 && wCompression != 32) || (wCompression == 0 && dwPacked != dwUnpacked + offs) || (dwUnpacked < dwPacked - offs)) { @@ -868,7 +868,7 @@ void ResourceManager::readResourcePatches(ResourceSource *source) { } else { // SCI0 scheme int resname_len = strlen(szResType); - if (scumm_strnicmp(name.c_str(), szResType, resname_len) == 0 + if (scumm_strnicmp(name.c_str(), szResType, resname_len) == 0 && !isalpha(name[resname_len + 1])) { number = atoi(name.c_str() + resname_len + 1); bAdd = true; @@ -1056,10 +1056,10 @@ int ResourceManager::readResourceInfo(Resource *res, Common::File *file, compression = kCompNone; break; case 1: - compression = (_sciVersion == SCI_VERSION_0) ? kCompLZW : kCompHuffman; + compression = (_sciVersion == SCI_VERSION_0) ? kCompLZW : kCompHuffman; break; case 2: - compression = (_sciVersion == SCI_VERSION_0) ? kCompHuffman : kCompLZW1; + compression = (_sciVersion == SCI_VERSION_0) ? kCompHuffman : kCompLZW1; break; case 3: compression = kCompLZW1View; |