X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FUtils%2FFolders.cpp;h=c4e86abf17ab2344d92fdda55edd3e9b130c3428;hb=20e924d;hp=e845b3f3e0995f700d92ff57a5b0d083828368b9;hpb=11ff9aec2c3206a5b9df5bf8815051458628c45a;p=lugaru.git

diff --git a/Source/Utils/Folders.cpp b/Source/Utils/Folders.cpp
index e845b3f..c4e86ab 100644
--- a/Source/Utils/Folders.cpp
+++ b/Source/Utils/Folders.cpp
@@ -27,11 +27,10 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include <pwd.h>
 #endif
 #if _WIN32
-#include <Windows.h>
-#include <WinBase.h>
+#include <windows.h>
 #endif
 
-const std::string Folders::dataDir = DATADIR;
+const std::string Folders::dataDir = DATA_DIR;
 
 std::string Folders::getScreenshotDir()
 {
@@ -87,12 +86,12 @@ std::string Folders::getConfigFilePath()
 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)) {
+    if ((path != NULL) && (strlen(path) != 0)) {
         ret = std::string(path) + "/lugaru";
     } else {
-        path = getHomeDirectory();
-        if((path != NULL) && (strlen(path) != 0)) {
-            ret = std::string(path) + '/' + fallback + "/lugaru";
+        const char* homedir = getHomeDirectory();
+        if ((homedir != NULL) && (strlen(homedir) != 0)) {
+            ret = std::string(homedir) + '/' + fallback + "/lugaru";
         } else {
             ret = ".";
         }
@@ -117,7 +116,7 @@ const char* Folders::getHomeDirectory()
 bool Folders::makeDirectory(std::string path) {
 #ifdef _WIN32
     int status = CreateDirectory(path.c_str(), NULL);
-    if(status != 0) {
+    if (status != 0) {
         return true;
     } else if(GetLastError() == ERROR_ALREADY_EXISTS) {
         return true;
@@ -136,3 +135,12 @@ bool Folders::makeDirectory(std::string path) {
     }
 #endif
 }
+
+FILE* Folders::openMandatoryFile(std::string filename, const char* mode)
+{
+    FILE* tfile = fopen(filename.c_str(), mode);
+    if (tfile == NULL) {
+        throw FileNotFoundException(filename);
+    }
+    return tfile;
+}