[Scummvm-cvs-logs] scummvm master -> 7cf482e7217cd2f88129c4d1b925f085d8043cd0

bluegr md5 at scummvm.org
Sat Feb 19 19:32:27 CET 2011


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:
7cf482e721 SCI: Reverted r914fe95, and silenced a false positive warning


Commit: 7cf482e7217cd2f88129c4d1b925f085d8043cd0
    https://github.com/scummvm/scummvm/commit/7cf482e7217cd2f88129c4d1b925f085d8043cd0
Author: md5 (md5 at scummvm.org)
Date: 2011-02-19T10:30:57-08:00

Commit Message:
SCI: Reverted r914fe95, and silenced a false positive warning

Changed paths:
    engines/sci/resource.cpp



diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index f24b659..f399478 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -1572,7 +1572,7 @@ void ResourceManager::readResourcePatches() {
 
 int ResourceManager::readResourceMapSCI0(ResourceSource *map) {
 	Common::SeekableReadStream *fileStream = 0;
-	ResourceType type;
+	ResourceType type = kResourceTypeInvalid;	// to silence a false positive in MSVC
 	uint16 number, id;
 	uint32 offset;
 
@@ -1611,7 +1611,6 @@ int ResourceManager::readResourceMapSCI0(ResourceSource *map) {
 			break;
 
 		if (_mapVersion == kResVersionKQ5FMT) {
-			type = convertResType(id >> 11);	// FIXME: This is wrong!
 			number = id;
 		} else {
 			type = convertResType(id >> 11);






More information about the Scummvm-git-logs mailing list