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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Fri Jan 1 15:41:11 CET 2010


Revision: 46831
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46831&view=rev
Author:   m_kiewitz
Date:     2010-01-01 14:41:11 +0000 (Fri, 01 Jan 2010)

Log Message:
-----------
SCI/newmusic: doing version check before looking for audio resource

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

Modified: scummvm/trunk/engines/sci/sfx/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2010-01-01 14:38:46 UTC (rev 46830)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2010-01-01 14:41:11 UTC (rev 46831)
@@ -292,7 +292,7 @@
 	// effects. If the resource exists, play it using map 65535 (sound
 	// effects map)
 
-	if (_resMan->testResource(ResourceId(kResourceTypeAudio, number)) && getSciVersion() >= SCI_VERSION_1_1) {
+	if (getSciVersion() >= SCI_VERSION_1_1 && _resMan->testResource(ResourceId(kResourceTypeAudio, number))) {
 		// Found a relevant audio resource, play it
 		int sampleLen;
 		newSound->pStreamAud = _audio->getAudioStream(number, 65535, &sampleLen);


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