Fixes #41 It was hard to click on the next campaign level when it’s above an old one

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

diff --git a/Source/Utils/Folders.cpp b/Source/Utils/Folders.cpp
index c4e86abf17ab2344d92fdda55edd3e9b130c3428..43b399e9a86334d3245fff8d8afd9ce944e973e3 100644 (file)
--- a/Source/Utils/Folders.cpp
+++ b/Source/Utils/Folders.cpp
@@ -18,15 +18,21 @@ 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 <shlobj.h> // to get paths related functions
 #include <windows.h>
 #endif
 
@@ -46,39 +52,39 @@ std::string Folders::getResourcePath(std::string filepath)
 
 std::string Folders::getUserDataPath()
 {
-#ifdef _WIN32
-    return dataDir;
-#else
     std::string userDataPath;
-#if (defined(__APPLE__) && defined(__MACH__))
+#ifdef _WIN32
+    char path[MAX_PATH];
+    // %APPDATA% (%USERPROFILE%\Application Data)
+    if(SUCCEEDED(SHGetFolderPathA(nullptr, CSIDL_APPDATA, nullptr, 0, path))) {
+        userDataPath = std::string(path) + "/Lugaru/";
+    } else {
+        return dataDir;
+    }
+#elif (defined(__APPLE__) && defined(__MACH__))
     const char* homePath = getHomeDirectory();
     if (homePath == NULL) {
         userDataPath = ".";
     } else {
         userDataPath = std::string(homePath) + "/Library/Application Support/Lugaru";
     }
-#else
+#else // Linux
     userDataPath = getGenericDirectory("XDG_DATA_HOME", ".local/share");
 #endif
     makeDirectory(userDataPath);
     return userDataPath;
-#endif
 }
 
 std::string Folders::getConfigFilePath()
 {
-#ifdef _WIN32
-    return dataDir + "/config.txt";
-#else
     std::string configFolder;
-#if (defined(__APPLE__) && defined(__MACH__))
+#if defined(_WIN32) || (defined(__APPLE__) && defined(__MACH__))
     configFolder = getUserDataPath();
-#else
+#else // Linux
     configFolder = getGenericDirectory("XDG_CONFIG_HOME", ".config");
-#endif
     makeDirectory(configFolder);
-    return configFolder + "/config.txt";
 #endif
+    return configFolder + "/config.txt";
 }
 
 #if PLATFORM_LINUX