[Scummvm-cvs-logs] SF.net SVN: scummvm:[52976] scummvm/branches/branch-1-2-0/engines/saga/ sndres.cpp

sev at users.sourceforge.net sev at users.sourceforge.net
Sat Oct 2 11:19:29 CEST 2010


Revision: 52976
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52976&view=rev
Author:   sev
Date:     2010-10-02 09:19:28 +0000 (Sat, 02 Oct 2010)

Log Message:
-----------
SAGA: backport bugfix for bug #3065113 with patched sound glitch

Modified Paths:
--------------
    scummvm/branches/branch-1-2-0/engines/saga/sndres.cpp

Modified: scummvm/branches/branch-1-2-0/engines/saga/sndres.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/engines/saga/sndres.cpp	2010-10-02 09:08:05 UTC (rev 52975)
+++ scummvm/branches/branch-1-2-0/engines/saga/sndres.cpp	2010-10-02 09:19:28 UTC (rev 52976)
@@ -225,6 +225,7 @@
 	}
 
 	Common::SeekableReadStream& readS = *file;
+	bool uncompressedSound = false;
 
 	if (soundResourceLength >= 8) {
 		byte header[8];
@@ -242,7 +243,6 @@
 			resourceType = kSoundShorten;
 		}
 
-		bool uncompressedSound = false;
 		// If patch data exists for sound resource 4 (used in ITE intro), don't treat this sound as compressed
 		// Patch data for this resource is in file p2_a.iaf or p2_a.voc
 		if (_vm->getGameId() == GID_ITE && resourceId == 4 && context->getResourceData(resourceId)->patchData != NULL)
@@ -277,7 +277,7 @@
 			buffer.flags &= ~Audio::FLAG_16BITS;
 		} else {
 			// Voice files in newer ITE demo versions are OKI ADPCM (VOX) encoded
-			if (!scumm_stricmp(context->fileName(), "voicesd.rsc"))
+			if (!uncompressedSound && !scumm_stricmp(context->fileName(), "voicesd.rsc"))
 				resourceType = kSoundVOX;
 		}
 	}


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