Console: Return gracefully when loading missing level

[lugaru.git] / Source / Utils / Folders.cpp

diff --git a/Source/Utils/Folders.cpp b/Source/Utils/Folders.cpp
index b667daa933a5d22bc59b1779ea086550d70ad9d6..3fa04025823b3502f4959ebc50e8a5fb83d6b57f 100644 (file)
--- a/Source/Utils/Folders.cpp
+++ b/Source/Utils/Folders.cpp
@@ -18,17 +18,22 @@ You should have received a copy of the GNU General Public License
 along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "Folders.h"
+#include "Folders.hpp"
+
 #include <cstring>
+#include <cstdlib>
+#include <cerrno>
 #include <unistd.h>
+
 #if PLATFORM_UNIX
+#include <pwd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <pwd.h>
 #endif
+
 #if _WIN32
-#include <windows.h>
 #include <shlobj.h> // to get paths related functions
+#include <windows.h>
 #endif
 
 const std::string Folders::dataDir = DATA_DIR;
@@ -40,11 +45,6 @@ std::string Folders::getScreenshotDir()
     return screenshotDir;
 }
 
-std::string Folders::getResourcePath(std::string filepath)
-{
-    return dataDir + '/' + filepath;
-}
-
 std::string Folders::getUserDataPath()
 {
     std::string userDataPath;
@@ -84,7 +84,7 @@ std::string Folders::getConfigFilePath()
 
 #if PLATFORM_LINUX
 /* Generic code for XDG ENVVAR test and fallback */
-std::string Folders::getGenericDirectory(const char* ENVVAR, const std::string fallback) {
+std::string Folders::getGenericDirectory(const char* ENVVAR, const std::string& fallback) {
     const char* path = getenv(ENVVAR);
     std::string ret;
     if ((path != NULL) && (strlen(path) != 0)) {
@@ -114,30 +114,18 @@ const char* Folders::getHomeDirectory()
 }
 #endif
 
-bool Folders::makeDirectory(std::string path) {
+bool Folders::makeDirectory(const std::string& path) {
 #ifdef _WIN32
     int status = CreateDirectory(path.c_str(), NULL);
-    if (status != 0) {
-        return true;
-    } else if(GetLastError() == ERROR_ALREADY_EXISTS) {
-        return true;
-    } else {
-        return false;
-    }
+    return ((status != 0) || (GetLastError() == ERROR_ALREADY_EXISTS));
 #else
     errno = 0;
     int status = mkdir(path.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
-    if (status == 0) {
-        return true;
-    } else if(errno == EEXIST) {
-        return true;
-    } else {
-        return false;
-    }
+    return ((status == 0) || (errno == EEXIST));
 #endif
 }
 
-FILE* Folders::openMandatoryFile(std::string filename, const char* mode)
+FILE* Folders::openMandatoryFile(const std::string& filename, const char* mode)
 {
     FILE* tfile = fopen(filename.c_str(), mode);
     if (tfile == NULL) {
@@ -145,3 +133,15 @@ FILE* Folders::openMandatoryFile(std::string filename, const char* mode)
     }
     return tfile;
 }
+
+bool Folders::file_exists(const std::string& filepath)
+{
+    FILE* file;
+    file = fopen(filepath.c_str(), "rb");
+    if (file == NULL) {
+        return false;
+    } else {
+        fclose(file);
+        return true;
+    }
+}