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

Migrate remaining C strings in config handling

Browse Source
This commit is contained in:
Gymnasiast
2023-01-07 15:27:29 +01:00
parent 18d9e72173
commit b6d422ff95
11 changed files with 48 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/title/TitleScreen.cpp
View File

@@ -201,8 +201,7 @@ void TitleScreen::ChangePresetSequence(size_t preset)
}
const utf8* configId = title_sequence_manager_get_config_id(preset);
SafeFree(gConfigInterface.CurrentTitleSequencePreset);
gConfigInterface.CurrentTitleSequencePreset = _strdup(configId);
gConfigInterface.CurrentTitleSequencePreset = configId;
if (!_previewingSequence)
_currentSequence = preset;
@@ -319,8 +318,7 @@ bool TitleScreen::TryLoadSequence(bool loadPreview)
{
// Forcefully change the preset to a preset that works.
const utf8* configId = title_sequence_manager_get_config_id(targetSequence);
SafeFree(gConfigInterface.CurrentTitleSequencePreset);
gConfigInterface.CurrentTitleSequencePreset = _strdup(configId);
gConfigInterface.CurrentTitleSequencePreset = configId;
}
_currentSequence = targetSequence;
gfx_invalidate_screen();
@@ -397,7 +395,7 @@ void title_set_hide_version_info(bool value)
size_t title_get_config_sequence()
{
return title_sequence_manager_get_index_for_config_id(gConfigInterface.CurrentTitleSequencePreset);
return title_sequence_manager_get_index_for_config_id(gConfigInterface.CurrentTitleSequencePreset.c_str());
}
size_t title_get_current_sequence()