diff options
| author | md5 | 2011-02-19 20:30:57 +0200 |
|---|---|---|
| committer | md5 | 2011-02-19 20:30:57 +0200 |
| commit | 7cf482e7217cd2f88129c4d1b925f085d8043cd0 (patch) | |
| tree | 4461ed1e3c2f362bc4170763c034e288c0ec0920 /engines | |
| parent | 914fe95903373ebf953e92aba9c2d0ef90125ad9 (diff) | |
| download | scummvm-rg350-7cf482e7217cd2f88129c4d1b925f085d8043cd0.tar.gz scummvm-rg350-7cf482e7217cd2f88129c4d1b925f085d8043cd0.tar.bz2 scummvm-rg350-7cf482e7217cd2f88129c4d1b925f085d8043cd0.zip | |
SCI: Reverted r914fe95, and silenced a false positive warning
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/resource.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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); |