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

Change rct2_path into a C++ string

Browse Source 
Co-authored-by: Ted John <ted@brambles.org>
This commit is contained in:
Michael Steenbeek
2022-01-05 15:18:25 +01:00
committed by GitHub
parent ca27c2181b
commit ff909cc286
5 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,7 +162,7 @@ namespace Config
model->fullscreen_height = reader->GetInt32("fullscreen_height", -1);
model->fullscreen_width = reader->GetInt32("fullscreen_width", -1);
model->rct1_path = reader->GetCString("rct1_path", nullptr);
model->rct2_path = reader->GetCString("game_path", nullptr);
model->rct2_path = reader->GetString("game_path", "");
model->landscape_smoothing = reader->GetBoolean("landscape_smoothing", true);
model->language = reader->GetEnum<int32_t>("language", platform_get_locale_language(), Enum_LanguageEnum);
model->measurement_format = reader->GetEnum<MeasurementFormat>(
@@ -798,7 +798,6 @@ bool config_save(const utf8* path)
void config_release()
{
SafeFree(gConfigGeneral.rct1_path);
SafeFree(gConfigGeneral.rct2_path);
SafeFree(gConfigGeneral.custom_currency_symbol);
SafeFree(gConfigGeneral.last_save_game_directory);
SafeFree(gConfigGeneral.last_save_landscape_directory);
@@ -830,8 +829,7 @@ bool config_find_or_browse_install_directory()
std::string path = Config::FindRCT2Path();
if (!path.empty())
{
Memory::Free(gConfigGeneral.rct2_path);
gConfigGeneral.rct2_path = String::Duplicate(path.c_str());
gConfigGeneral.rct2_path = path;
}
else
{
@@ -922,8 +920,7 @@ bool config_find_or_browse_install_directory()
{
return false;
}
Memory::Free(gConfigGeneral.rct2_path);
gConfigGeneral.rct2_path = String::Duplicate(installPath.c_str());
gConfigGeneral.rct2_path = installPath;
if (platform_original_game_data_exists(installPath.c_str()))
{