mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 22:34:33 +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

5
src/openrct2/Context.cpp
View File

@@ -772,9 +772,10 @@ namespace OpenRCT2
if (String::IsNullOrEmpty(gCustomRCT2DataPath)) if (String::IsNullOrEmpty(gCustomRCT2DataPath))
{ {
// Check install directory // Check install directory
if (gConfigGeneral.rct2_path == nullptr || !platform_original_game_data_exists(gConfigGeneral.rct2_path)) if (gConfigGeneral.rct2_path.empty() || !platform_original_game_data_exists(gConfigGeneral.rct2_path.c_str()))
{ {
log_verbose("install directory does not exist or invalid directory selected, %s", gConfigGeneral.rct2_path); log_verbose(
"install directory does not exist or invalid directory selected, %s", gConfigGeneral.rct2_path.c_str());
if (!config_find_or_browse_install_directory()) if (!config_find_or_browse_install_directory())
{ {
utf8 path[MAX_PATH]; utf8 path[MAX_PATH];

2
src/openrct2/PlatformEnvironment.cpp
View File

@@ -174,7 +174,7 @@ std::unique_ptr<IPlatformEnvironment> OpenRCT2::CreatePlatformEnvironment()
} }
if (String::IsNullOrEmpty(gCustomRCT2DataPath)) if (String::IsNullOrEmpty(gCustomRCT2DataPath))
{ {
env->SetBasePath(DIRBASE::RCT2, String::ToStd(gConfigGeneral.rct2_path)); env->SetBasePath(DIRBASE::RCT2, gConfigGeneral.rct2_path);
} }
// Log base paths // Log base paths

2
src/openrct2/cmdline/RootCommands.cpp
View File

@@ -379,7 +379,7 @@ static exitcode_t HandleCommandSetRCT2(CommandLineArgEnumerator* enumerator)
auto configPath = env->GetFilePath(OpenRCT2::PATHID::CONFIG); auto configPath = env->GetFilePath(OpenRCT2::PATHID::CONFIG);
config_set_defaults(); config_set_defaults();
config_open(configPath.c_str()); config_open(configPath.c_str());
String::DiscardDuplicate(&gConfigGeneral.rct2_path, path); gConfigGeneral.rct2_path = std::string(path);
if (config_save(configPath.c_str())) if (config_save(configPath.c_str()))
{ {
Console::WriteFormat("Updating RCT2 path to '%s'.", path); Console::WriteFormat("Updating RCT2 path to '%s'.", path);

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

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

2
src/openrct2/config/Config.h
View File

@@ -26,7 +26,7 @@ struct GeneralConfiguration
{ {
// Paths // Paths
utf8* rct1_path; utf8* rct1_path;
utf8* rct2_path; std::string rct2_path;
// Display // Display
int32_t default_display; int32_t default_display;