[Scummvm-git-logs] scummvm master -> 662791a9616fe5bd9eb81e7e231785b8e508cc70
bgK
bastien.bouclet at gmail.com
Wed Jan 30 06:50:36 CET 2019
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:
662791a961 COMMON: Include hidden files in directory listings by default
Commit: 662791a9616fe5bd9eb81e7e231785b8e508cc70
https://github.com/scummvm/scummvm/commit/662791a9616fe5bd9eb81e7e231785b8e508cc70
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2019-01-30T06:48:32+01:00
Commit Message:
COMMON: Include hidden files in directory listings by default
Hidden files are now only ignored in the GUI file browser when the user
has not checked 'show hidden files'.
Myst III has the hidden flag set for one of the directories containing
datafiles on the CD-ROM. When users copy the files to their hard drives
the hidden flag is kept. Detection worked previously because hidden
files were explicitly requested in the AD code. The engine would fail
to open the datafiles because SearchMan.addSubDirectoryMatching
ignored hidden directories.
Changed paths:
common/fs.cpp
common/fs.h
engines/advancedDetector.cpp
diff --git a/common/fs.cpp b/common/fs.cpp
index d93270f..54fdf89 100644
--- a/common/fs.cpp
+++ b/common/fs.cpp
@@ -257,7 +257,7 @@ void FSDirectory::cacheDirectoryRecursive(FSNode node, int depth, const String&
return;
FSList list;
- node.getChildren(list, FSNode::kListAll, true);
+ node.getChildren(list, FSNode::kListAll);
FSList::iterator it = list.begin();
for ( ; it != list.end(); ++it) {
diff --git a/common/fs.h b/common/fs.h
index ed287cc..6ff5c6e 100644
--- a/common/fs.h
+++ b/common/fs.h
@@ -135,7 +135,7 @@ public:
*
* @return true if successful, false otherwise (e.g. when the directory does not exist).
*/
- bool getChildren(FSList &fslist, ListMode mode = kListDirectoriesOnly, bool hidden = false) const;
+ bool getChildren(FSList &fslist, ListMode mode = kListDirectoriesOnly, bool hidden = true) const;
/**
* Return a human readable string for this node, usable for display (e.g.
diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index 26b06b6..10ddb0d 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -244,7 +244,7 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine)
}
Common::FSNode dir(path);
Common::FSList files;
- if (!dir.isDirectory() || !dir.getChildren(files, Common::FSNode::kListAll, true)) {
+ if (!dir.isDirectory() || !dir.getChildren(files, Common::FSNode::kListAll)) {
warning("Game data path does not exist or is not a directory (%s)", path.c_str());
return Common::kNoGameDataFoundError;
}
More information about the Scummvm-git-logs
mailing list