libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 09:18:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

WINTERMUTE: Simplify getNodeForRelativePath

Browse Source
This commit is contained in:
Einar Johan Trøan Sømåen 2012-08-31 16:34:12 +02:00
parent 764ca7a51a
commit 71981aaecf
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/wintermute/base/file/base_disk_file.cpp
View File

@ -71,14 +71,11 @@ static Common::FSNode getNodeForRelativePath(const Common::String &filename) {
// Get the next path-component by slicing on '\\'
Common::String pathPart = path.nextToken();
// Get the next FSNode in the chain, if it exists as a child from the previous.
Common::FSNode nextNode(curNode.getChild(pathPart));
if (!nextNode.exists()) {
curNode = curNode.getChild(pathPart);
if (!curNode.isReadable()) {
// Return an invalid FSNode.
return Common::FSNode();
}
if (nextNode.exists() && nextNode.isReadable()) {
curNode = nextNode;
}
// Following the comments in common/fs.h, anything not a directory is a file.
if (!curNode.isDirectory()) {
if (!path.empty()) {