diff options
| author | Strangerke | 2013-04-02 07:57:38 +0200 |
|---|---|---|
| committer | Strangerke | 2013-04-02 07:58:12 +0200 |
| commit | c7d7c747539ba93c946ea41416ed2586d2084d2b (patch) | |
| tree | 02c8350596eabd90b908d8e32dc02acab3be0350 /engines/hopkins | |
| parent | d9d75d059c3c7239c1da92322377a8ce58e58287 (diff) | |
| download | scummvm-rg350-c7d7c747539ba93c946ea41416ed2586d2084d2b.tar.gz scummvm-rg350-c7d7c747539ba93c946ea41416ed2586d2084d2b.tar.bz2 scummvm-rg350-c7d7c747539ba93c946ea41416ed2586d2084d2b.zip | |
HOPKINS: Remove useless check in loadLinkFile, remove comment. Thanks SylvainTV for pointing it
Diffstat (limited to 'engines/hopkins')
| -rw-r--r-- | engines/hopkins/files.cpp | 2 | ||||
| -rw-r--r-- | engines/hopkins/objects.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp index 98cc34422e..13d30029ca 100644 --- a/engines/hopkins/files.cpp +++ b/engines/hopkins/files.cpp @@ -183,7 +183,7 @@ byte *FileManager::searchCat(const Common::String &file, CatMode mode) { ptr = loadFile(tmpFilename); break; } - // Deliberate fall-through to + default: break; } diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp index 227da29212..3ae8f9d770 100644 --- a/engines/hopkins/objects.cpp +++ b/engines/hopkins/objects.cpp @@ -3124,7 +3124,7 @@ void ObjectsManager::loadLinkFile(const Common::String &file, bool skipDetails) if (!filename2.empty()) { _hidingItemData[1] = _vm->_fileManager->searchCat(filename2, RES_SLI); - if (_hidingItemData[1] || _hidingItemData[1] == g_PTRNUL) { + if (_hidingItemData[1]) { _hidingItemData[1] = _vm->_fileManager->loadFile(filename2); } else { _hidingItemData[1] = _vm->_fileManager->loadFile("RES_SLI.RES"); |