Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-04-29 17:19:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1049 from diath/update_resourcemanager

Browse Source 
Move isDirectory logic from an anonymous namespace to ResourceManager::directoryExists
This commit is contained in:
Konrad Kuśnierz 2019-10-11 08:47:49 +02:00 committed by GitHub
commit ca868b9b61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/framework/core/resourcemanager.cpp
View File

@ -29,21 +29,6 @@
#include <physfs.h>
namespace {
bool isDirectory(const std::string &path)
{
PHYSFS_Stat stat = {};
int result = PHYSFS_stat(path.c_str(), &stat);
if (!result) {
return false;
}
return stat.filetype == PHYSFS_FILETYPE_DIRECTORY;
}
} // namespace <anonymous>
ResourceManager g_resources;
void ResourceManager::init(const char *argv0)
@ -171,12 +156,18 @@ void ResourceManager::searchAndAddPackages(const std::string& packagesDir, const
bool ResourceManager::fileExists(const std::string& fileName)
{
return (PHYSFS_exists(resolvePath(fileName).c_str()) && !isDirectory(resolvePath(fileName)));
const std::string path = resolvePath(fileName);
return (PHYSFS_exists(path.c_str()) && !directoryExists(path));
}
bool ResourceManager::directoryExists(const std::string& directoryName)
{
return isDirectory(resolvePath(directoryName));
PHYSFS_Stat stat = {};
if (!PHYSFS_stat(directoryName.c_str(), &stat)) {
return false;
}
return stat.filetype == PHYSFS_FILETYPE_DIRECTORY;
}
void ResourceManager::readFileStream(const std::string& fileName, std::iostream& out)