4 Commits

Author SHA1 Message Date
Tixx
386f471362 Fix includes for linux build 2025-09-16 20:16:28 +02:00
Tixx
6c3bfda23b Bump version to v2.6.2 2025-09-16 20:09:56 +02:00
Tixx
5737e27bf3 Use ini instead of registry for game dir 2025-09-16 20:07:57 +02:00
Tixx
1860c0aef1 Fix userfolder on linux (hopefully) 2025-09-16 20:07:26 +02:00
3 changed files with 40 additions and 20 deletions

View File

@@ -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

View File

@@ -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,43 @@ 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);
}
}
}
delete[] appDataPath;
#elif defined(__linux__)
struct passwd* pw = getpwuid(getuid());
std::filesystem::path homeDir = pw->pw_dir;

View File

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