diff options
Diffstat (limited to 'src/filesystem/filesystem.cc')
-rw-r--r-- | src/filesystem/filesystem.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/filesystem/filesystem.cc b/src/filesystem/filesystem.cc index d275667..11ece3c 100644 --- a/src/filesystem/filesystem.cc +++ b/src/filesystem/filesystem.cc @@ -64,7 +64,7 @@ void init(std::string const & basename, std::string const & modname) filesystem_homedir.append("/.osirion"); // create homedir if necessary - if (!sys::isdirectory(filesystem_homedir)) + if (!sys::directory_exists(filesystem_homedir)) sys::mkdir(filesystem_homedir); filesystem_homedir += '/'; @@ -78,11 +78,11 @@ void init(std::string const & basename, std::string const & modname) if (filesystem_homedir.size()) { filesystem_homedir.append("\\My Games"); - if (!sys::isdirectory(filesystem_homedir)) + if (!sys::directory_exists(filesystem_homedir)) sys::mkdir(filesystem_homedir); filesystem_homedir.append("\\Osirion"); - if (!sys::isdirectory(filesystem_homedir)) + if (!sys::directory_exists(filesystem_homedir)) sys::mkdir(filesystem_homedir); filesystem_homedir.append("\\"); @@ -90,7 +90,7 @@ void init(std::string const & basename, std::string const & modname) con_warn << "using fallback home directory" << std::endl; filesystem_homedir.assign("home"); - if (!sys::isdirectory(filesystem_homedir)) + if (!sys::directory_exists(filesystem_homedir)) sys::mkdir(filesystem_homedir); filesystem_homedir += '/'; } @@ -111,7 +111,7 @@ void init(std::string const & basename, std::string const & modname) } // create writedir if necessary - if (!sys::isdirectory(filesystem_writedir)) + if (!sys::directory_exists(filesystem_writedir)) sys::mkdir(filesystem_writedir); filesystem_writedir += '/'; @@ -119,21 +119,21 @@ void init(std::string const & basename, std::string const & modname) if (filesystem_modname.size()) { // HOME/modname dir.assign(filesystem_homedir + filesystem_modname); - if (sys::isdirectory(dir)) { + if (sys::directory_exists(dir)) { dir += '/'; filesystem_searchpath.push_back(dir); } // CURRENT/data/modname dir.assign(current_datadir + filesystem_modname); - if (sys::isdirectory(dir)) { + if (sys::directory_exists(dir)) { dir += '/'; filesystem_searchpath.push_back(dir); } // PACKAGE_DATADIR/modname std::string dir(package_datadir + '/' + filesystem_modname); - if (sys::isdirectory(dir)) { + if (sys::directory_exists(dir)) { dir += '/'; filesystem_searchpath.push_back(dir); } @@ -142,21 +142,21 @@ void init(std::string const & basename, std::string const & modname) // basename search path // HOME/basename dir.assign(filesystem_homedir + filesystem_basename); - if (sys::isdirectory(dir)) { + if (sys::directory_exists(dir)) { dir += '/'; filesystem_searchpath.push_back(dir); } // PACKAGE_DATADIR/basename dir.assign(package_datadir + '/' + filesystem_basename); - if (sys::isdirectory(dir)) { + if (sys::directory_exists(dir)) { dir += '/'; filesystem_searchpath.push_back(dir); filesystem_datadir.assign(dir); } else { // CURRENT/data/basename dir.assign(current_datadir + filesystem_basename); - if (sys::isdirectory(dir)) { + if (sys::directory_exists(dir)) { dir += '/'; filesystem_searchpath.push_back(dir); filesystem_datadir.assign(dir); |