diff options
| author | Robert Göffringmann | 2004-12-13 02:02:47 +0000 |
|---|---|---|
| committer | Robert Göffringmann | 2004-12-13 02:02:47 +0000 |
| commit | 1ec06340da2f5790fa13c2a41e9dcfc3b3505b6e (patch) | |
| tree | 20ef24f2cb67535a6eb4d9397546bd6028ea75c8 | |
| parent | 1ded9cff77d06d3cca6754f3b546fc3eaacaacd0 (diff) | |
| download | scummvm-rg350-1ec06340da2f5790fa13c2a41e9dcfc3b3505b6e.tar.gz scummvm-rg350-1ec06340da2f5790fa13c2a41e9dcfc3b3505b6e.tar.bz2 scummvm-rg350-1ec06340da2f5790fa13c2a41e9dcfc3b3505b6e.zip | |
fixed a bug that I introduced with the last cleanup.
(caused the graphical glitches in the pipe factory)
svn-id: r16043
| -rw-r--r-- | sky/disk.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sky/disk.cpp b/sky/disk.cpp index 2fd4917048..104f453653 100644 --- a/sky/disk.cpp +++ b/sky/disk.cpp @@ -167,7 +167,8 @@ uint8 *Disk::loadFile(uint16 fileNr) { #endif memcpy(uncompDest, fileDest, sizeof(dataFileHeader)); unpackLen = rncDecoder.unpackM1(fileDest + sizeof(dataFileHeader), uncompDest + sizeof(dataFileHeader), 0); - unpackLen += sizeof(dataFileHeader); + if (unpackLen) + unpackLen += sizeof(dataFileHeader); } debug(3, "UnpackM1 returned: %d", unpackLen); @@ -177,7 +178,7 @@ uint8 *Disk::loadFile(uint16 fileNr) { return fileDest; } else { if (unpackLen != (int32)decompSize) - debug(1, "ERROR: invalid decomp size! (was: %d, should be: %d)", unpackLen, decompSize); + debug(1, "ERROR: File %d: invalid decomp size! (was: %d, should be: %d)", fileNr, unpackLen, decompSize); _lastLoadedFileSize = decompSize; free(fileDest); |