diff --git a/src/openrct2/platform/Platform.Android.cpp b/src/openrct2/platform/Platform.Android.cpp index 9927056dcb..e6bc6e444f 100644 --- a/src/openrct2/platform/Platform.Android.cpp +++ b/src/openrct2/platform/Platform.Android.cpp @@ -87,14 +87,14 @@ namespace Platform std::string GetSteamPath() { - return ""; + return {}; } # ifndef NO_TTF std::string GetFontPath(const TTFFontDescriptor& font) { STUB(); - return ""; + return {}; } # endif diff --git a/src/openrct2/platform/Platform.Linux.cpp b/src/openrct2/platform/Platform.Linux.cpp index 4f69f37462..f70db58095 100644 --- a/src/openrct2/platform/Platform.Linux.cpp +++ b/src/openrct2/platform/Platform.Linux.cpp @@ -297,7 +297,7 @@ namespace Platform const char* homeDir = getpwuid(getuid())->pw_dir; if (homeDir == nullptr) { - return ""; + return {}; } auto steamPath = Path::Combine(homeDir, ".local/share/Steam/ubuntu12_32/steamapps/content"); @@ -312,7 +312,7 @@ namespace Platform return steamPath; } - return ""; + return {}; } std::string GetFontPath(const TTFFontDescriptor& font) @@ -323,7 +323,7 @@ namespace Platform { log_error("Failed to initialize FontConfig library"); FcFini(); - return ""; + return {}; } FcPattern* pat = FcNameParse(reinterpret_cast(font.font_name)); diff --git a/src/openrct2/platform/Platform.Win32.cpp b/src/openrct2/platform/Platform.Win32.cpp index 4cae076866..02a39ca464 100644 --- a/src/openrct2/platform/Platform.Win32.cpp +++ b/src/openrct2/platform/Platform.Win32.cpp @@ -831,13 +831,13 @@ namespace Platform LRESULT result; if (RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\Valve\\Steam", &hKey) != ERROR_SUCCESS) - return ""; + return {}; // Get the size of the path first if (RegQueryValueExW(hKey, L"SteamPath", nullptr, &type, nullptr, &size) != ERROR_SUCCESS) { RegCloseKey(hKey); - return ""; + return {}; } std::string outPath = ""; @@ -866,7 +866,7 @@ namespace Platform return Path::Combine(outPathTemp, font.filename); } - return ""; + return {}; # else log_warning("Compatibility hack: falling back to C:\\Windows\\Fonts"); return Path::Combine("C:\\Windows\\Fonts\\", font.filename); diff --git a/src/openrct2/platform/Platform.macOS.mm b/src/openrct2/platform/Platform.macOS.mm index ec31c5a99c..cb419662eb 100644 --- a/src/openrct2/platform/Platform.macOS.mm +++ b/src/openrct2/platform/Platform.macOS.mm @@ -239,7 +239,7 @@ namespace Platform const char* homeDir = getpwuid(getuid())->pw_dir; if (homeDir == nullptr) { - return ""; + return {}; } auto steamPath = Path::Combine( @@ -249,7 +249,7 @@ namespace Platform return steamPath; } - return ""; + return {}; } std::string GetFontPath(const TTFFontDescriptor& font) @@ -266,7 +266,7 @@ namespace Platform } else { - return ""; + return {}; } } }