From c7d7c747539ba93c946ea41416ed2586d2084d2b Mon Sep 17 00:00:00 2001 From: Strangerke Date: Tue, 2 Apr 2013 07:57:38 +0200 Subject: HOPKINS: Remove useless check in loadLinkFile, remove comment. Thanks SylvainTV for pointing it --- engines/hopkins/files.cpp | 2 +- engines/hopkins/objects.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'engines') 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"); -- cgit v1.2.3