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

[fingolfin at users.sourceforge.net]

Revision: 49829
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49829&view=rev
Author:   fingolfin
Date:     2010-06-15 12:17:25 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
SCI: cleanup

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-15 12:17:05 UTC (rev 49828)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-06-15 12:17:25 UTC (rev 49829)
@@ -351,7 +351,8 @@
 
 	if (!fileStream) {
 		warning("Failed to open %s", getLocationName().c_str());
-		res->unalloc();
+		if (res)
+			res->unalloc();
 	}
 
 	return fileStream;

Modified: scummvm/trunk/engines/sci/resource_audio.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource_audio.cpp	2010-06-15 12:17:05 UTC (rev 49828)
+++ scummvm/trunk/engines/sci/resource_audio.cpp	2010-06-15 12:17:25 UTC (rev 49829)
@@ -36,20 +36,15 @@
 AudioVolumeResourceSource::AudioVolumeResourceSource(const Common::String &name, ResourceSource *map, int volNum)
 	: VolumeResourceSource(name, map, volNum, kSourceAudioVolume) {
 
-	ResourceManager *resMan = g_sci->getResMan();
-
 	/*
 	 * Check if this audio volume got compressed by our tool. If that is the
 	 * case, set _audioCompressionType and read in the offset translation
 	 * table for later usage.
 	 */
 
-	Common::SeekableReadStream *fileStream = resMan->getVolumeFile(this);
-
-	if (!fileStream) {
-		warning("Failed to open %s", getLocationName().c_str());
+	Common::SeekableReadStream *fileStream = getVolumeFile(0);
+	if (!fileStream)
 		return;
-	}
 
 	fileStream->seek(0, SEEK_SET);
 	uint32 compressionType = fileStream->readUint32BE();


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