diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-02-15 17:01:46 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-02-15 17:01:46 +0300 |
commit | 382067b05c4fe97bcf0da0143405375ec295f7c6 (patch) | |
tree | f668cd2595ac0c85f0942f88729d3ff1956676fa /src/resources/resourcemanager.cpp | |
parent | ee8191705826d978b7793497fdd307536c709bff (diff) | |
parent | 9b329556e748050c4300174e9bdc72b15e5b8cc5 (diff) | |
download | plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.gz plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.bz2 plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.xz plus-382067b05c4fe97bcf0da0143405375ec295f7c6.zip |
Merge branch 'master' into stable
Diffstat (limited to 'src/resources/resourcemanager.cpp')
-rw-r--r-- | src/resources/resourcemanager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index 4cc7a4574..954930b64 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -399,7 +399,7 @@ bool ResourceManager::exists(const std::string &path) const return PhysFs::exists(path.c_str()); } -bool ResourceManager::existsLocal(const std::string &path) const +bool ResourceManager::existsLocal(const std::string &path) { bool flg(false); std::fstream file; @@ -415,7 +415,7 @@ bool ResourceManager::isDirectory(const std::string &path) const return PhysFs::isDirectory(path.c_str()); } -std::string ResourceManager::getPath(const std::string &file) const +std::string ResourceManager::getPath(const std::string &file) { // get the real path to the file const char *const tmp = PhysFs::getRealDir(file.c_str()); @@ -982,7 +982,7 @@ void *ResourceManager::loadFile(const std::string &fileName, int &fileSize) } bool ResourceManager::copyFile(const std::string &restrict src, - const std::string &restrict dst) const + const std::string &restrict dst) { PHYSFS_file *const srcFile = PhysFs::openRead(src.c_str()); if (!srcFile) @@ -1054,7 +1054,7 @@ bool ResourceManager::loadTextFileLocal(const std::string &fileName, void ResourceManager::saveTextFile(std::string path, const std::string &restrict name, - const std::string &restrict text) const + const std::string &restrict text) { if (!mkdir_r(path.c_str())) { |