libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-12 12:09:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Reverted r914fe95, and silenced a false positive warning

Browse Source
This commit is contained in:
md5 2011-02-19 20:30:57 +02:00
parent 914fe95903
commit 7cf482e721
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/sci/resource.cpp
View File

@ -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);