[Scummvm-cvs-logs] CVS: scummvm/sky disk.cpp,1.61,1.62

[Robert Göffringmann]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12065/sky

Modified Files:
	disk.cpp 
Log Message:
fixed a bug that I introduced with the last cleanup.
(caused the graphical glitches in the pipe factory)

Index: disk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- disk.cpp	27 Nov 2004 15:09:53 -0000	1.61
+++ disk.cpp	13 Dec 2004 02:02:47 -0000	1.62
@@ -167,7 +167,8 @@
 #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 @@
 			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);