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

[waltervn at users.sourceforge.net]

Revision: 41222
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41222&view=rev
Author:   waltervn
Date:     2009-06-06 12:30:13 +0000 (Sat, 06 Jun 2009)

Log Message:
-----------
SCI: Fix audio regression in KQ5CD, introduced in r41205.

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

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2009-06-06 12:18:39 UTC (rev 41221)
+++ scummvm/trunk/engines/sci/resource.cpp	2009-06-06 12:30:13 UTC (rev 41222)
@@ -1650,11 +1650,13 @@
 	byte *data = 0;
 	char filename[40];
 	byte flags = 0;
+	Sci::Resource* audioRes = NULL;
 
 	// Try to load from resource manager
-	if (volume == 65535) {
-		Sci::Resource* audioRes = _resMgr->findResource(kResourceTypeAudio, audioNumber, false);
+	if (volume == 65535)
+		audioRes = _resMgr->findResource(kResourceTypeAudio, audioNumber, false);
 
+	if (audioRes) {
 		if (_sciVersion < SCI_VERSION_1_1) {
 			size = audioRes->size;
 			data = audioRes->data;


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