[Scummvm-git-logs] scummvm master -> afc48cfb0ec2ce3e87b7121f5616bc01f6281284

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
afc48cfb0e Revert "SHERLOCK: Disable cache for uncompressed resources"


Commit: afc48cfb0ec2ce3e87b7121f5616bc01f6281284
    https://github.com/scummvm/scummvm/commit/afc48cfb0ec2ce3e87b7121f5616bc01f6281284
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-05-05T14:36:14-04:00

Commit Message:
Revert "SHERLOCK: Disable cache for uncompressed resources"

This reverts commit 20d5a67f8b71c668ca304b85c1d8b91759922031.

Changed paths:
    engines/sherlock/resources.cpp


diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index 9ed6951..ec7d60a 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -57,23 +57,24 @@ void Cache::load(const Common::String &name, Common::SeekableReadStream &stream)
 
 	int32 signature = stream.readUint32BE();
 	stream.seek(0);
-	
-	// Check whether the file is compressed
-	if (signature == MKTAG('L', 'Z', 'V', 26)) {
 
-		// Allocate a new cache entry
-		_resources[name] = CacheEntry();
-		CacheEntry &cacheEntry = _resources[name];
+	// Allocate a new cache entry
+	_resources[name] = CacheEntry();
+	CacheEntry &cacheEntry = _resources[name];
 
+	// Check whether the file is compressed
+	if (signature == MKTAG('L', 'Z', 'V', 26)) {
 		// It's compressed, so decompress the file and store its data in the cache entry
 		Common::SeekableReadStream *decompressed = _vm->_res->decompress(stream);
 		cacheEntry.resize(decompressed->size());
 		decompressed->read(&cacheEntry[0], decompressed->size());
 
 		delete decompressed;
-
+	} else {
+		// It's not, so read the raw data of the file into the cache entry
+		cacheEntry.resize(stream.size());
+		stream.read(&cacheEntry[0], stream.size());
 	}
-
 }
 
 Common::SeekableReadStream *Cache::get(const Common::String &filename) const {