[Scummvm-cvs-logs] SF.net SVN: scummvm: [23112] tools/branches/branch-0-9-0/compress_kyra.cpp

[lordhoto at users.sourceforge.net]

Revision: 23112
Author:   lordhoto
Date:     2006-06-14 13:08:51 -0700 (Wed, 14 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23112&view=rev

Log Message:
-----------
Makes compress_kyra not failing on broken VOC files. (see bug #1503133 ("compress_kyra: dead.vrm error")).

Modified Paths:
--------------
    tools/branches/branch-0-9-0/compress_kyra.cpp
Modified: tools/branches/branch-0-9-0/compress_kyra.cpp
===================================================================
--- tools/branches/branch-0-9-0/compress_kyra.cpp	2006-06-14 19:44:22 UTC (rev 23111)
+++ tools/branches/branch-0-9-0/compress_kyra.cpp	2006-06-14 20:08:51 UTC (rev 23112)
@@ -197,6 +197,15 @@
 		
 		fseek(file, startOffset, SEEK_SET);
 		fseek(file, 26, SEEK_CUR);
+
+		if (fgetc(file) != 1) {
+			warning("broken VOC file '%s' skipping it...", tempPak.filename);
+			startOffset = endOffset;
+			fseek(file, position, SEEK_SET);
+			continue;
+		}
+
+		fseek(file, -1, SEEK_CUR);
 		
 		uint8 *temp = new uint8[endOffset - startOffset];
 		assert(temp);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.