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

Move RCT2 Steam path retrieval to its own function

Browse Source
This commit is contained in:
Gymnasiast
2025-12-13 14:55:21 +01:00
parent 6db4ac56f2
commit b7608126a7
1 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/openrct2/config/Config.cpp
View File

@@ -745,25 +745,8 @@ namespace OpenRCT2::Config
return {};
}
/**
* Attempts to find the RCT2 installation directory.
* This should be created from some other resource when OpenRCT2 grows.
* @returns Path to RCT2, if found. Empty string otherwise.
*/
static u8string FindRCT2Path()
static u8string FindRCT2SteamPath()
{
LOG_VERBOSE("config_find_rct2_path(...)");
static std::vector<u8string_view> searchLocations = Platform::GetSearchablePathsRCT2();
for (const auto& location : searchLocations)
{
if (Platform::OriginalGameDataExists(location))
{
return u8string(location);
}
}
auto steamPaths = Platform::GetSteamPaths();
if (steamPaths.isSteamPresent())
{
@@ -792,6 +775,35 @@ namespace OpenRCT2::Config
}
}
return {};
}
/**
* Attempts to find the RCT2 installation directory.
* This should be created from some other resource when OpenRCT2 grows.
* @returns Path to RCT2, if found. Empty string otherwise.
*/
static u8string FindRCT2Path()
{
LOG_VERBOSE("config_find_rct2_path(...)");
static std::vector<u8string_view> searchLocations = Platform::GetSearchablePathsRCT2();
for (const auto& location : searchLocations)
{
if (Platform::OriginalGameDataExists(location))
{
return u8string(location);
}
}
// Will only return a path if the RCT2 data is present, so no need to check twice.
auto steamPath = FindRCT2SteamPath();
if (!steamPath.empty())
{
return steamPath;
}
auto discordPath = Platform::GetFolderPath(SpecialFolder::rct2Discord);
if (!discordPath.empty() && Platform::OriginalGameDataExists(discordPath))
{