diff --git a/src/openrct2/platform/Platform.Android.cpp b/src/openrct2/platform/Platform.Android.cpp index 56259cf75c..6a8cb9a5f5 100644 --- a/src/openrct2/platform/Platform.Android.cpp +++ b/src/openrct2/platform/Platform.Android.cpp @@ -151,6 +151,16 @@ namespace Platform return {}; } + u8string GetRCT1SteamDir() + { + return {}; + } + + u8string GetRCT2SteamDir() + { + return {}; + } + # ifndef NO_TTF std::string GetFontPath(const TTFFontDescriptor& font) { diff --git a/src/openrct2/platform/Platform.Linux.cpp b/src/openrct2/platform/Platform.Linux.cpp index 516c126cfe..aa79ec8d8f 100644 --- a/src/openrct2/platform/Platform.Linux.cpp +++ b/src/openrct2/platform/Platform.Linux.cpp @@ -299,7 +299,15 @@ namespace Platform return {}; } - auto steamPath = Path::Combine(homeDir, u8".local/share/Steam/ubuntu12_32/steamapps/content"); + // Prefer new path for Steam, which is the default when using with Proton + auto steamPath = Path::Combine(homeDir, u8".local/share/Steam/steamapps/common"); + if (Path::DirectoryExists(steamPath)) + { + return steamPath; + } + + // Fallback paths + steamPath = Path::Combine(homeDir, u8".local/share/Steam/ubuntu12_32/steamapps/content"); if (Path::DirectoryExists(steamPath)) { return steamPath; @@ -310,10 +318,19 @@ namespace Platform { return steamPath; } - return {}; } + u8string GetRCT1SteamDir() + { + return u8"Rollercoaster Tycoon Deluxe"; + } + + u8string GetRCT2SteamDir() + { + return u8"Rollercoaster Tycoon 2"; + } + # ifndef NO_TTF std::string GetFontPath(const TTFFontDescriptor& font) { diff --git a/src/openrct2/platform/Platform.Posix.cpp b/src/openrct2/platform/Platform.Posix.cpp index 684885de29..f34dd70d00 100644 --- a/src/openrct2/platform/Platform.Posix.cpp +++ b/src/openrct2/platform/Platform.Posix.cpp @@ -369,17 +369,6 @@ namespace Platform datetime64 utcNow = epochAsTicks + utcEpochTicks; return utcNow; } - - u8string GetRCT1SteamDir() - { - return u8"app_285310" PATH_SEPARATOR u8"depot_285311"; - } - - u8string GetRCT2SteamDir() - { - return u8"app_285330" PATH_SEPARATOR u8"depot_285331"; - } - } // namespace Platform #endif diff --git a/src/openrct2/platform/Platform.macOS.mm b/src/openrct2/platform/Platform.macOS.mm index fa65b5e69b..3f7789bcaa 100644 --- a/src/openrct2/platform/Platform.macOS.mm +++ b/src/openrct2/platform/Platform.macOS.mm @@ -252,6 +252,16 @@ namespace Platform return {}; } + u8string GetRCT1SteamDir() + { + return u8"app_285310" PATH_SEPARATOR u8"depot_285311"; + } + + u8string GetRCT2SteamDir() + { + return u8"app_285330" PATH_SEPARATOR u8"depot_285331"; + } + std::string GetFontPath(const TTFFontDescriptor& font) { @autoreleasepool