From 7cf482e7217cd2f88129c4d1b925f085d8043cd0 Mon Sep 17 00:00:00 2001
From: md5
Date: Sat, 19 Feb 2011 20:30:57 +0200
Subject: SCI: Reverted r914fe95, and silenced a false positive warning

---
 engines/sci/resource.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'engines/sci/resource.cpp')

diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index f24b659899..f399478005 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);
-- 
cgit v1.2.3