[Scummvm-cvs-logs] SF.net SVN: scummvm:[49606] scummvm/trunk/engines/sci

[thebluegr at users.sourceforge.net]

Revision: 49606
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49606&view=rev
Author:   thebluegr
Date:     2010-06-12 11:43:30 +0000 (Sat, 12 Jun 2010)

Log Message:
-----------
Initialize compression-related variables when loading external patch files. Fixes Cassima's speech in the intro of KQ6 (the engine thought that the external patch files of her speech were compressed)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/resource.cpp
    scummvm/trunk/engines/sci/resource_audio.cpp

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-06-12 11:41:22 UTC (rev 49605)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-06-12 11:43:30 UTC (rev 49606)
@@ -1230,6 +1230,8 @@
 				psrcPatch->source_type = kSourcePatch;
 				psrcPatch->location_name = name;
 				psrcPatch->resourceFile = 0;
+				psrcPatch->audioCompressionType = 0;
+				psrcPatch->audioCompressionOffsetMapping = NULL;
 				processPatch(psrcPatch, (ResourceType)i, resourceNr, resource36.tuple);
 			}
 		}
@@ -1281,6 +1283,8 @@
 				psrcPatch->source_type = kSourcePatch;
 				psrcPatch->location_name = name;
 				psrcPatch->resourceFile = 0;
+				psrcPatch->audioCompressionType = 0;
+				psrcPatch->audioCompressionOffsetMapping = NULL;
 				processPatch(psrcPatch, (ResourceType)i, resourceNr);
 			}
 		}

Modified: scummvm/trunk/engines/sci/resource_audio.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource_audio.cpp	2010-06-12 11:41:22 UTC (rev 49605)
+++ scummvm/trunk/engines/sci/resource_audio.cpp	2010-06-12 11:43:30 UTC (rev 49606)
@@ -158,6 +158,8 @@
 		psrcPatch->source_type = kSourcePatch;
 		psrcPatch->resourceFile = 0;
 		psrcPatch->location_name = gmPatchFile;
+		psrcPatch->audioCompressionType = 0;
+		psrcPatch->audioCompressionOffsetMapping = NULL;
 		processPatch(psrcPatch, kResourceTypePatch, 4);
 	}
 }


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