[Scummvm-cvs-logs] SF.net SVN: scummvm:[48887] tools/trunk

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Sun May 2 00:20:51 CEST 2010


Revision: 48887
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48887&view=rev
Author:   m_kiewitz
Date:     2010-05-01 22:20:50 +0000 (Sat, 01 May 2010)

Log Message:
-----------
SCI/TOOLS: adding hack for fixing 2 resources inside lsl6 resource.aud file, fixing wrong directory name in msvc9 project

Modified Paths:
--------------
    tools/trunk/dist/msvc9/toolscli.vcproj
    tools/trunk/engines/sci/compress_sci.cpp

Modified: tools/trunk/dist/msvc9/toolscli.vcproj
===================================================================
--- tools/trunk/dist/msvc9/toolscli.vcproj	2010-05-01 20:53:09 UTC (rev 48886)
+++ tools/trunk/dist/msvc9/toolscli.vcproj	2010-05-01 22:20:50 UTC (rev 48887)
@@ -216,11 +216,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\tinsel\compress_sci.cpp"
+				RelativePath="..\..\engines\sci\compress_sci.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\tinsel\compress_sci.h"
+				RelativePath="..\..\engines\sci\compress_sci.h"
 				>
 			</File>
 			<File

Modified: tools/trunk/engines/sci/compress_sci.cpp
===================================================================
--- tools/trunk/engines/sci/compress_sci.cpp	2010-05-01 20:53:09 UTC (rev 48886)
+++ tools/trunk/engines/sci/compress_sci.cpp	2010-05-01 22:20:50 UTC (rev 48887)
@@ -90,6 +90,11 @@
 		// see above
 		_input.read_throwsOnError(&buffer[6], 8);
 		dataSize = READ_LE_UINT32(buffer + 9);
+		// HACK: LSL6 resource.aud has a SOL that specifies incorrect dataSize, we fix it here
+		if ((_inputOffset == 0x619bf07) && (dataSize == 0x1dd78))
+			dataSize--;
+		if ((_inputOffset == 0x101DFBC5) && (dataSize == 0x1cfc1))
+			dataSize--;
 		_inputEndOffset = _inputOffset + 14 + dataSize;
 		return kSciResourceDataTypeSOL;
 	}
@@ -339,6 +344,7 @@
 
 	int resourceCount = 0;
 	do {
+		print("offset %lx\n", _inputOffset);
 		recognizedDataType = detectData(header, false);
 		if (!recognizedDataType)
 			error("Unsupported data at offset %lx", _inputOffset);


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




More information about the Scummvm-git-logs mailing list