BeamMP/BeamMP-Launcher
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Launcher.git synced 2025-07-01 15:36:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to using INI parser for startup.ini file

Browse Source
This commit is contained in:
Tixx 2025-04-27 23:35:39 +02:00
parent efe9f5b614
commit f193c25de6
No known key found for this signature in database
GPG Key ID: EC6E7A2BAABF0B8C
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/GameStart.cpp
View File

@ -18,11 +18,13 @@
#endif
#include "Logger.h"
#include "Options.h"
#include "Startup.h"
#include "Utils.h"
#include <Security/Init.h>
#include <filesystem>
#include <thread>
#include "Options.h"
#include <fstream>
unsigned long GamePID = 0;
@ -43,18 +45,31 @@ std::string GetGamePath() {
if (const auto startupIniPath = std::filesystem::path(GetGameDir()) / "startup.ini"; exists(startupIniPath)) {
std::ifstream startupIni(startupIniPath);
std::string line;
while (std::getline(startupIni, line))
if (line.find("UserPath = ") == 0) {
std::string userPath = line.substr(11);
if (std::ifstream startupIni(startupIniPath); startupIni.is_open()) {
std::string contents((std::istreambuf_iterator(startupIni)), std::istreambuf_iterator<char>());
startupIni.close();
if (contents.size() > 3) {
contents.erase(0, 3);
}
auto ini = Utils::ParseINI(contents);
if (ini.empty()) {
warn("Failed to parse startup.ini");
} else
debug("Successfully parsed startup.ini");
std::string userPath;
if (ini.contains("filesystem") && ini["filesystem"].contains("UserPath"))
userPath = ini["filesystem"]["UserPath"];
if (!userPath.empty())
if (std::filesystem::exists(userPath)) {
if (userPath = Utils::ExpandEnvVars(userPath); std::filesystem::exists(userPath)) {
Path = userPath;
debug("Using custom user folder path from startup.ini: " + Path.string());
} else
warn("Found custom user folder path ("+ userPath + ") in startup.ini but it doesn't exist, skipping");
}
if (Path.empty()) {