Bump version to v2.6.3

src/GameStart.cpp

@@ -122,10 +122,10 @@ std::filesystem::path GetGamePath() {
     struct passwd* pw = getpwuid(getuid());
     std::string homeDir = pw->pw_dir;
 
-    std::string Path = homeDir + "/.local/share/BeamNG.drive/";
+    std::string Path = homeDir + "/.local/share/BeamNG/BeamNG.drive/";
     std::string Ver = CheckVer(GetGameDir());
     Ver = Ver.substr(0, Ver.find('.', Ver.find('.') + 1));
-    Path += Ver + "/";
+    Path += "current/";
     return Path;
 }
 #endif

src/Security/BeamNG.cpp

@@ -7,6 +7,7 @@
 
 #include <filesystem>
 #if defined(_WIN32)
+#include <shlobj_core.h>
 #elif defined(__linux__)
 #include "vdf_parser.hpp"
 #include <pwd.h>
@@ -162,24 +163,66 @@ void FileList(std::vector<std::string>& a, const std::string& Path) {
 }
 void LegitimacyCheck() {
 #if defined(_WIN32)
-    std::wstring Result;
-    std::string K3 = R"(Software\BeamNG\BeamNG.drive)";
-    HKEY hKey;
-    LONG dwRegOPenKey = OpenKey(HKEY_CURRENT_USER, K3.c_str(), &hKey);
-    if (dwRegOPenKey == ERROR_SUCCESS) {
-        Result = QueryKey(hKey, 3);
-        if (Result.empty()) {
-            debug("Failed to QUERY key HKEY_CURRENT_USER\\Software\\BeamNG\\BeamNG.drive");
-            lowExit(3);
-        }
-        GameDir = Result;
-    } else {
-        debug("Failed to OPEN key HKEY_CURRENT_USER\\Software\\BeamNG\\BeamNG.drive");
-        lowExit(4);
+    wchar_t* appDataPath = new wchar_t[MAX_PATH];
+    HRESULT result = SHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, 0, appDataPath);
+
+    if (!SUCCEEDED(result)) {
+        fatal("Cannot get Local Appdata directory");
     }
-    K3.clear();
-    Result.clear();
-    RegCloseKey(hKey);
+
+    auto BeamNGAppdataPath = std::filesystem::path(appDataPath) / "BeamNG";
+
+    if (const auto beamngIniPath = BeamNGAppdataPath / "BeamNG.Drive.ini"; exists(beamngIniPath)) {
+        if (std::ifstream beamngIni(beamngIniPath); beamngIni.is_open()) {
+            std::string contents((std::istreambuf_iterator(beamngIni)), std::istreambuf_iterator<char>());
+            beamngIni.close();
+
+            auto ini = Utils::ParseINI(contents);
+            if (ini.empty())
+                lowExit(3);
+            else
+                debug("Successfully parsed BeamNG.Drive.ini");
+
+            if (ini.contains("installPath")) {
+                std::wstring installPath = Utils::ToWString(std::get<std::string>(ini["installPath"]));
+                installPath.erase(0, installPath.find_first_not_of(L" \t"));
+
+                if (installPath = std::filesystem::path(Utils::ExpandEnvVars(installPath)); std::filesystem::exists(installPath)) {
+                    GameDir = installPath;
+                    debug(L"GameDir from BeamNG.Drive.ini: " + installPath);
+                } else {
+                    lowExit(4);
+                }
+            } else {
+                lowExit(5);
+            }
+        }
+    } else {
+        std::wstring Result;
+
+        std::string K3 = R"(Software\BeamNG\BeamNG.drive)";
+
+        HKEY hKey;
+
+        LONG dwRegOPenKey = OpenKey(HKEY_CURRENT_USER, K3.c_str(), &hKey);
+        if (dwRegOPenKey == ERROR_SUCCESS) {
+            Result = QueryKey(hKey, 3);
+            if (Result.empty()) {
+                debug("Failed to QUERY key HKEY_CURRENT_USER\\Software\\BeamNG\\BeamNG.drive");
+                lowExit(6);
+            }
+            GameDir = Result;
+            debug(L"GameDir from registry: " + Result);
+        } else {
+            debug("Failed to OPEN key HKEY_CURRENT_USER\\Software\\BeamNG\\BeamNG.drive");
+            lowExit(7);
+        }
+        K3.clear();
+        Result.clear();
+        RegCloseKey(hKey);
+    }
+
+    delete[] appDataPath;
 #elif defined(__linux__)
     struct passwd* pw = getpwuid(getuid());
     std::filesystem::path homeDir = pw->pw_dir;

src/Startup.cpp

@@ -87,7 +87,7 @@ std::string GetVer() {
     return "2.6";
 }
 std::string GetPatch() {
-    return ".1";
+    return ".3";
 }
 
 beammp_fs_string GetEP(const beammp_fs_char* P) {