[Scummvm-cvs-logs] scummvm master -> c7d7c747539ba93c946ea41416ed2586d2084d2b
Strangerke
Strangerke at scummvm.org
Tue Apr 2 07:59:38 CEST 2013
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c7d7c74753 HOPKINS: Remove useless check in loadLinkFile, remove comment. Thanks SylvainTV for pointing it
Commit: c7d7c747539ba93c946ea41416ed2586d2084d2b
https://github.com/scummvm/scummvm/commit/c7d7c747539ba93c946ea41416ed2586d2084d2b
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-04-01T22:58:12-07:00
Commit Message:
HOPKINS: Remove useless check in loadLinkFile, remove comment. Thanks SylvainTV for pointing it
Changed paths:
engines/hopkins/files.cpp
engines/hopkins/objects.cpp
diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 98cc344..13d3002 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 227da29..3ae8f9d 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");
More information about the Scummvm-git-logs
mailing list