[Scummvm-cvs-logs] scummvm master -> 4401f40f7203f7aaa78c2e1c904c70902325436c

[somaen]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4105805505 WINTERMUTE: Fix for unnecessary "WARNING: getChildren() failed for path:"
4401f40f72 WINTERMUTE: Prevent warning about duplicate files when autodetecting.


Commit: 4105805505b5083c9be3f846713f0cf67422f957
    https://github.com/scummvm/scummvm/commit/4105805505b5083c9be3f846713f0cf67422f957
Author: Tobia Tesan (tobia.tesan at gmail.com)
Date: 2013-06-06T14:33:50-07:00

Commit Message:
WINTERMUTE: Fix for unnecessary "WARNING: getChildren() failed for path:"

FSNode::getChildren() was called assuming that it returns 0 iff success.
Actually, it's the other way around.

Changed paths:
    engines/wintermute/base/base_file_manager.cpp



diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index 4c7c315..7d59b03 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -192,7 +192,7 @@ bool BaseFileManager::registerPackages() {
 	Common::FSList files;
 	for (Common::FSList::iterator it = _packagePaths.begin(); it != _packagePaths.end(); ++it) {
 		debugC(kWintermuteDebugFileAccess, "Should register folder: %s %s", (*it).getPath().c_str(), (*it).getName().c_str());
-		if ((*it).getChildren(files, Common::FSNode::kListFilesOnly)) {
+		if (!(*it).getChildren(files, Common::FSNode::kListFilesOnly)) {
 			warning("getChildren() failed for path: %s", (*it).getDisplayName().c_str());
 		}
 		for (Common::FSList::iterator fileIt = files.begin(); fileIt != files.end(); ++fileIt) {


Commit: 4401f40f7203f7aaa78c2e1c904c70902325436c
    https://github.com/scummvm/scummvm/commit/4401f40f7203f7aaa78c2e1c904c70902325436c
Author: Tobia Tesan (tobia.tesan at gmail.com)
Date: 2013-06-06T14:34:06-07:00

Commit Message:
WINTERMUTE: Prevent warning about duplicate files when autodetecting.

Removed a call to BaseFileManager::registerPackages() in
WintermuteEngine::getGameInfo(), as the constructor for BaseFileManager
already calls registerPackages() once; another call should thus be
superfluous.

Changed paths:
    engines/wintermute/wintermute.cpp



diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp
index 89a6f1b..9238174 100644
--- a/engines/wintermute/wintermute.cpp
+++ b/engines/wintermute/wintermute.cpp
@@ -292,7 +292,6 @@ bool WintermuteEngine::getGameInfo(const Common::FSList &fslist, Common::String
 	Common::SeekableReadStream *stream = nullptr;
 	// Quick-fix, instead of possibly breaking the persistence-system, let's just roll with it
 	BaseFileManager *fileMan = new BaseFileManager(Common::UNK_LANG, true);
-	fileMan->registerPackages(fslist);
 	stream = fileMan->openFile("startup.settings", false, false);
 
 	// The process is as follows: Check the "GAME=" tag in startup.settings, to decide where the