mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Remove platform_get_user_directory() (#16530)

Browse Source
This commit is contained in:
Michael Steenbeek
2022-01-29 13:01:05 +01:00
committed by GitHub
parent df77222390
commit f43a4344ce
12 changed files with 73 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/openrct2/network/NetworkBase.cpp
View File

@@ -947,10 +947,8 @@ void NetworkBase::SaveGroups()
{
if (GetMode() == NETWORK_MODE_SERVER)
{
utf8 path[MAX_PATH];
platform_get_user_directory(path, nullptr, sizeof(path));
safe_strcat_path(path, "groups.json", sizeof(path));
auto env = GetContext().GetPlatformEnvironment();
auto path = Path::Combine(env->GetDirectoryPath(DIRBASE::USER), "groups.json");
json_t jsonGroups = json_t::array();
for (auto& group : group_list)
@@ -967,7 +965,7 @@ void NetworkBase::SaveGroups()
}
catch (const std::exception& ex)
{
log_error("Unable to save %s: %s", path, ex.what());
log_error("Unable to save %s: %s", path.c_str(), ex.what());
}
}
}
@@ -1009,10 +1007,8 @@ void NetworkBase::LoadGroups()
{
group_list.clear();
utf8 path[MAX_PATH];
platform_get_user_directory(path, nullptr, sizeof(path));
safe_strcat_path(path, "groups.json", sizeof(path));
auto env = GetContext().GetPlatformEnvironment();
auto path = Path::Combine(env->GetDirectoryPath(DIRBASE::USER), "groups.json");
json_t jsonGroupConfig;
if (File::Exists(path))
@@ -1023,7 +1019,7 @@ void NetworkBase::LoadGroups()
}
catch (const std::exception& e)
{
log_error("Failed to read %s as JSON. Setting default groups. %s", path, e.what());
log_error("Failed to read %s as JSON. Setting default groups. %s", path.c_str(), e.what());
}
}