[Scummvm-cvs-logs] SF.net SVN: scummvm:[52605] scummvm/trunk/engines/sci/sound/soundcmd.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 52605
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52605&view=rev
Author:   m_kiewitz
Date:     2010-09-06 19:00:43 +0000 (Mon, 06 Sep 2010)

Log Message:
-----------
SCI: dont play audio on kDoSound in hoyle4

hoyle4 has garbled audio data

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/soundcmd.cpp

Modified: scummvm/trunk/engines/sci/sound/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-09-06 18:23:03 UTC (rev 52604)
+++ scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-09-06 19:00:43 UTC (rev 52605)
@@ -78,8 +78,12 @@
 	// a relevant audio resource, play it, otherwise switch to synthesized
 	// effects. If the resource exists, play it using map 65535 (sound
 	// effects map)
+	bool checkAudioResource = getSciVersion() >= SCI_VERSION_1_1;
+	if (g_sci->getGameId() == GID_HOYLE4)
+		checkAudioResource = false; // hoyle 4 has garbled audio resources in place of the sound resources
+	// if we play those, we will only make the user deaf and break speakers
 
-	if (getSciVersion() >= SCI_VERSION_1_1 && _resMan->testResource(ResourceId(kResourceTypeAudio, resourceId))) {
+	if (checkAudioResource && _resMan->testResource(ResourceId(kResourceTypeAudio, resourceId))) {
 		// Found a relevant audio resource, play it
 		int sampleLen;
 		newSound->pStreamAud = _audio->getAudioStream(resourceId, 65535, &sampleLen);


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