mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename global config functions to use TitleCase

This commit is contained in:
Hielke Morsink 2022-10-16 18:00:03 +02:00
parent f9d1f024c2
commit 5fa53ad528
No known key found for this signature in database
GPG Key ID: FE0B343DF883E7F2
27 changed files with 143 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2-ui/UiContext.cpp
View File

@ -354,7 +354,7 @@ public:
if (displayIndex != gConfigGeneral.DefaultDisplay)
{
gConfigGeneral.DefaultDisplay = displayIndex;
config_save_default();
ConfigSaveDefault();
}
break;
}
@ -802,7 +802,7 @@ private:
{
gConfigGeneral.WindowWidth = width;
gConfigGeneral.WindowHeight = height;
config_save_default();
ConfigSaveDefault();
}
}
}

6
src/openrct2-ui/input/Shortcuts.cpp
View File

@ -474,7 +474,7 @@ static void ShortcutOpenSceneryPicker()
static void ShortcutScaleUp()
{
gConfigGeneral.WindowScale += 0.25f;
config_save_default();
ConfigSaveDefault();
gfx_invalidate_screen();
context_trigger_resize();
context_update_cursor_scale();
@ -484,7 +484,7 @@ static void ShortcutScaleDown()
{
gConfigGeneral.WindowScale -= 0.25f;
gConfigGeneral.WindowScale = std::max(0.5f, gConfigGeneral.WindowScale);
config_save_default();
ConfigSaveDefault();
gfx_invalidate_screen();
context_trigger_resize();
context_update_cursor_scale();
@ -731,7 +731,7 @@ static void ShortcutToggleTransparentWater()
return;
gConfigGeneral.TransparentWater ^= 1;
config_save_default();
ConfigSaveDefault();
gfx_invalidate_screen();
}

10
src/openrct2-ui/windows/CustomCurrency.cpp
View File

@ -71,7 +71,7 @@ public:
case WIDX_RATE_UP:
CurrencyDescriptors[EnumValue(CurrencyType::Custom)].rate += 1;
gConfigGeneral.CustomCurrencyRate = CurrencyDescriptors[EnumValue(CurrencyType::Custom)].rate;
config_save_default();
ConfigSaveDefault();
window_invalidate_all();
break;
case WIDX_RATE_DOWN:
@ -79,7 +79,7 @@ public:
{
CurrencyDescriptors[EnumValue(CurrencyType::Custom)].rate -= 1;
gConfigGeneral.CustomCurrencyRate = CurrencyDescriptors[EnumValue(CurrencyType::Custom)].rate;
config_save_default();
ConfigSaveDefault();
window_invalidate_all();
}
break;
@ -144,7 +144,7 @@ public:
}
gConfigGeneral.CustomCurrencyAffix = CurrencyDescriptors[EnumValue(CurrencyType::Custom)].affix_unicode;
config_save_default();
ConfigSaveDefault();
window_invalidate_all();
}
@ -168,7 +168,7 @@ public:
gConfigGeneral.CustomCurrencySymbol, CurrencyDescriptors[EnumValue(CurrencyType::Custom)].symbol_unicode,
CURRENCY_SYMBOL_MAX_SIZE);
config_save_default();
ConfigSaveDefault();
window_invalidate_all();
break;
@ -179,7 +179,7 @@ public:
rate = res.value();
CurrencyDescriptors[EnumValue(CurrencyType::Custom)].rate = rate;
gConfigGeneral.CustomCurrencyRate = CurrencyDescriptors[EnumValue(CurrencyType::Custom)].rate;
config_save_default();
ConfigSaveDefault();
window_invalidate_all();
}
break;

6
src/openrct2-ui/windows/EditorObjectSelection.cpp
View File

@ -368,7 +368,7 @@ public:
case WIDX_FILTER_RIDE_TAB_ALL:
_filter_flags |= FILTER_RIDES;
gConfigInterface.ObjectSelectionFilterFlags = _filter_flags;
config_save_default();
ConfigSaveDefault();
FilterUpdateCounts();
VisibleListRefresh();
@ -386,7 +386,7 @@ public:
_filter_flags &= ~FILTER_RIDES;
_filter_flags |= (1 << (widgetIndex - WIDX_FILTER_RIDE_TAB_TRANSPORT + _numSourceGameItems));
gConfigInterface.ObjectSelectionFilterFlags = _filter_flags;
config_save_default();
ConfigSaveDefault();
FilterUpdateCounts();
VisibleListRefresh();
@ -547,7 +547,7 @@ public:
_filter_flags ^= (1 << dropdownIndex);
}
gConfigInterface.ObjectSelectionFilterFlags = _filter_flags;
config_save_default();
ConfigSaveDefault();
FilterUpdateCounts();
scrolls->v_top = 0;

6
src/openrct2-ui/windows/LoadSave.cpp
View File

@ -487,7 +487,7 @@ static void WindowLoadsaveMouseup(rct_window* w, WidgetIndex widgetIndex)
{
gConfigGeneral.LoadSaveSort = Sort::NameAscending;
}
config_save_default();
ConfigSaveDefault();
WindowLoadsaveSortList();
w->Invalidate();
break;
@ -501,7 +501,7 @@ static void WindowLoadsaveMouseup(rct_window* w, WidgetIndex widgetIndex)
{
gConfigGeneral.LoadSaveSort = Sort::DateDescending;
}
config_save_default();
ConfigSaveDefault();
WindowLoadsaveSortList();
w->Invalidate();
break;
@ -961,7 +961,7 @@ static void WindowLoadsaveInvokeCallback(int32_t result, const utf8* path)
static void SetAndSaveConfigPath(u8string& config_str, u8string_view path)
{
config_str = Path::GetDirectory(path);
config_save_default();
ConfigSaveDefault();
}
static bool IsValidPath(const char* path)

6
src/openrct2-ui/windows/Multiplayer.cpp
View File

@ -959,15 +959,15 @@ static void WindowMultiplayerOptionsMouseup(rct_window* w, WidgetIndex widgetInd
break;
case WIDX_LOG_CHAT_CHECKBOX:
gConfigNetwork.LogChat = !gConfigNetwork.LogChat;
config_save_default();
ConfigSaveDefault();
break;
case WIDX_LOG_SERVER_ACTIONS_CHECKBOX:
gConfigNetwork.LogServerActions = !gConfigNetwork.LogServerActions;
config_save_default();
ConfigSaveDefault();
break;
case WIDX_KNOWN_KEYS_ONLY_CHECKBOX:
gConfigNetwork.KnownKeysOnly = !gConfigNetwork.KnownKeysOnly;
config_save_default();
ConfigSaveDefault();
break;
}
}

2
src/openrct2-ui/windows/NewRide.cpp
View File

@ -344,7 +344,7 @@ public:
break;
case WIDX_GROUP_BY_TRACK_TYPE:
gConfigInterface.ListRideVehiclesSeparately = !gConfigInterface.ListRideVehiclesSeparately;
config_save_default();
ConfigSaveDefault();
SetPage(_currentTab);
break;
}

2
src/openrct2-ui/windows/NewsOptions.cpp
View File

@ -129,7 +129,7 @@ public:
bool* configValue = GetNotificationValuePtr(ndef);
*configValue = !(*configValue);
config_save_default();
ConfigSaveDefault();
InvalidateWidget(widgetIndex);
break;

138
src/openrct2-ui/windows/Options.cpp
View File

@ -683,40 +683,40 @@ private:
case WIDX_UNCAP_FPS_CHECKBOX:
gConfigGeneral.UncapFPS ^= 1;
drawing_engine_set_vsync(gConfigGeneral.UseVSync);
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_USE_VSYNC_CHECKBOX:
gConfigGeneral.UseVSync ^= 1;
drawing_engine_set_vsync(gConfigGeneral.UseVSync);
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_SHOW_FPS_CHECKBOX:
gConfigGeneral.ShowFPS ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_MULTITHREADING_CHECKBOX:
gConfigGeneral.MultiThreading ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_MINIMIZE_FOCUS_LOSS:
gConfigGeneral.MinimizeFullscreenFocusLoss ^= 1;
RefreshVideo(false);
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_STEAM_OVERLAY_PAUSE:
gConfigGeneral.SteamOverlayPause ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_DISABLE_SCREENSAVER_LOCK:
gConfigGeneral.DisableScreensaver ^= 1;
ApplyScreenSaverLockSetting();
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
}
@ -790,7 +790,7 @@ private:
}
case WIDX_SCALE_UP:
gConfigGeneral.WindowScale += 0.25f;
config_save_default();
ConfigSaveDefault();
gfx_invalidate_screen();
context_trigger_resize();
context_update_cursor_scale();
@ -798,7 +798,7 @@ private:
case WIDX_SCALE_DOWN:
gConfigGeneral.WindowScale -= 0.25f;
gConfigGeneral.WindowScale = std::max(0.5f, gConfigGeneral.WindowScale);
config_save_default();
ConfigSaveDefault();
gfx_invalidate_screen();
context_trigger_resize();
context_update_cursor_scale();
@ -823,7 +823,7 @@ private:
if (gConfigGeneral.FullscreenMode == static_cast<int32_t>(OpenRCT2::Ui::FULLSCREEN_MODE::FULLSCREEN))
context_set_fullscreen_mode(static_cast<int32_t>(OpenRCT2::Ui::FULLSCREEN_MODE::FULLSCREEN));
config_save_default();
ConfigSaveDefault();
gfx_invalidate_screen();
}
}
@ -834,7 +834,7 @@ private:
context_set_fullscreen_mode(dropdownIndex);
gConfigGeneral.FullscreenMode = static_cast<uint8_t>(dropdownIndex);
config_save_default();
ConfigSaveDefault();
gfx_invalidate_screen();
}
break;
@ -847,7 +847,7 @@ private:
gConfigGeneral.DrawingEngine = dstEngine;
bool recreate_window = drawing_engine_requires_new_window(srcEngine, dstEngine);
RefreshVideo(recreate_window);
config_save_default();
ConfigSaveDefault();
Invalidate();
}
break;
@ -926,13 +926,13 @@ private:
{
case WIDX_TILE_SMOOTHING_CHECKBOX:
gConfigGeneral.LandscapeSmoothing ^= 1;
config_save_default();
ConfigSaveDefault();
gfx_invalidate_screen();
break;
case WIDX_GRIDLINES_CHECKBOX:
{
gConfigGeneral.AlwaysShowGridlines ^= 1;
config_save_default();
ConfigSaveDefault();
gfx_invalidate_screen();
rct_window* mainWindow = window_get_main();
if (mainWindow != nullptr)
@ -946,45 +946,45 @@ private:
}
case WIDX_DAY_NIGHT_CHECKBOX:
gConfigGeneral.DayNightCycle ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_ENABLE_LIGHT_FX_CHECKBOX:
gConfigGeneral.EnableLightFx ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_ENABLE_LIGHT_FX_FOR_VEHICLES_CHECKBOX:
gConfigGeneral.EnableLightFxForVehicles ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_UPPER_CASE_BANNERS_CHECKBOX:
gConfigGeneral.UpperCaseBanners ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
scrolling_text_invalidate();
break;
case WIDX_DISABLE_LIGHTNING_EFFECT_CHECKBOX:
gConfigGeneral.DisableLightningEffect ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_RENDER_WEATHER_EFFECTS_CHECKBOX:
gConfigGeneral.RenderWeatherEffects ^= 1;
gConfigGeneral.RenderWeatherGloom = gConfigGeneral.RenderWeatherEffects;
config_save_default();
ConfigSaveDefault();
Invalidate();
gfx_invalidate_screen();
break;
case WIDX_SHOW_GUEST_PURCHASES_CHECKBOX:
gConfigGeneral.ShowGuestPurchases ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_TRANSPARENT_SCREENSHOTS_CHECKBOX:
gConfigGeneral.TransparentScreenshot ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
}
@ -1016,7 +1016,7 @@ private:
{
case WIDX_VIRTUAL_FLOOR_DROPDOWN:
gConfigGeneral.VirtualFloorStyle = static_cast<VirtualFloorStyles>(dropdownIndex);
config_save_default();
ConfigSaveDefault();
break;
}
}
@ -1181,7 +1181,7 @@ private:
{
gConfigGeneral.ShowHeightAsUnits = 1;
}
config_save_default();
ConfigSaveDefault();
UpdateHeightMarkers();
break;
case WIDX_CURRENCY_DROPDOWN:
@ -1194,19 +1194,19 @@ private:
{
gConfigGeneral.CurrencyFormat = static_cast<CurrencyType>(dropdownIndex);
}
config_save_default();
ConfigSaveDefault();
gfx_invalidate_screen();
break;
case WIDX_DISTANCE_DROPDOWN:
gConfigGeneral.MeasurementFormat = static_cast<MeasurementFormat>(dropdownIndex);
config_save_default();
ConfigSaveDefault();
UpdateHeightMarkers();
break;
case WIDX_TEMPERATURE_DROPDOWN:
if (dropdownIndex != static_cast<int32_t>(gConfigGeneral.TemperatureFormat))
{
gConfigGeneral.TemperatureFormat = static_cast<TemperatureUnit>(dropdownIndex);
config_save_default();
ConfigSaveDefault();
gfx_invalidate_screen();
}
break;
@ -1230,7 +1230,7 @@ private:
else
{
gConfigGeneral.Language = dropdownIndex + 1;
config_save_default();
ConfigSaveDefault();
gfx_invalidate_screen();
}
}
@ -1240,7 +1240,7 @@ private:
if (dropdownIndex != gConfigGeneral.DateFormat)
{
gConfigGeneral.DateFormat = static_cast<uint8_t>(dropdownIndex);
config_save_default();
ConfigSaveDefault();
gfx_invalidate_screen();
}
break;
@ -1294,7 +1294,7 @@ private:
{
case WIDX_SOUND_CHECKBOX:
gConfigSound.SoundEnabled = !gConfigSound.SoundEnabled;
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
@ -1305,7 +1305,7 @@ private:
else
OpenRCT2::Audio::Resume();
window_invalidate_by_class(WindowClass::TopToolbar);
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
@ -1315,13 +1315,13 @@ private:
{
OpenRCT2::RideAudio::StopAllChannels();
}
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_AUDIO_FOCUS_CHECKBOX:
gConfigSound.audio_focus = !gConfigSound.audio_focus;
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
}
@ -1400,7 +1400,7 @@ private:
audioContext->SetOutputDevice(deviceName);
gConfigSound.Device = deviceName;
}
config_save_default();
ConfigSaveDefault();
OpenRCT2::Audio::PlayTitleMusic();
}
Invalidate();
@ -1414,7 +1414,7 @@ private:
}
gConfigSound.TitleMusic = titleMusic;
config_save_default();
ConfigSaveDefault();
Invalidate();
OpenRCT2::Audio::StopTitleMusic();
@ -1435,7 +1435,7 @@ private:
if (masterVolume != gConfigSound.MasterVolume)
{
gConfigSound.MasterVolume = masterVolume;
config_save_default();
ConfigSaveDefault();
InvalidateWidget(WIDX_MASTER_VOLUME);
}
@ -1445,7 +1445,7 @@ private:
if (soundVolume != gConfigSound.SoundVolume)
{
gConfigSound.SoundVolume = soundVolume;
config_save_default();
ConfigSaveDefault();
InvalidateWidget(WIDX_SOUND_VOLUME);
}
@ -1455,7 +1455,7 @@ private:
if (rideMusicVolume != gConfigSound.AudioFocus)
{
gConfigSound.AudioFocus = rideMusicVolume;
config_save_default();
ConfigSaveDefault();
InvalidateWidget(WIDX_MUSIC_VOLUME);
}
}
@ -1534,65 +1534,65 @@ private:
break;
case WIDX_SCREEN_EDGE_SCROLLING:
gConfigGeneral.EdgeScrolling ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_TRAP_CURSOR:
gConfigGeneral.TrapCursor ^= 1;
config_save_default();
ConfigSaveDefault();
context_set_cursor_trap(gConfigGeneral.TrapCursor);
Invalidate();
break;
case WIDX_ZOOM_TO_CURSOR:
gConfigGeneral.ZoomToCursor ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_TOOLBAR_SHOW_FINANCES:
gConfigInterface.ToolbarShowFinances ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
window_invalidate_by_class(WindowClass::TopToolbar);
break;
case WIDX_TOOLBAR_SHOW_RESEARCH:
gConfigInterface.ToolbarShowResearch ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
window_invalidate_by_class(WindowClass::TopToolbar);
break;
case WIDX_TOOLBAR_SHOW_CHEATS:
gConfigInterface.ToolbarShowCheats ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
window_invalidate_by_class(WindowClass::TopToolbar);
break;
case WIDX_TOOLBAR_SHOW_NEWS:
gConfigInterface.ToolbarShowNews ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
window_invalidate_by_class(WindowClass::TopToolbar);
break;
case WIDX_TOOLBAR_SHOW_MUTE:
gConfigInterface.ToolbarShowMute ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
window_invalidate_by_class(WindowClass::TopToolbar);
break;
case WIDX_TOOLBAR_SHOW_CHAT:
gConfigInterface.ToolbarShowChat ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
window_invalidate_by_class(WindowClass::TopToolbar);
break;
case WIDX_TOOLBAR_SHOW_ZOOM:
gConfigInterface.ToolbarShowZoom ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
window_invalidate_by_class(WindowClass::TopToolbar);
break;
case WIDX_INVERT_DRAG:
gConfigGeneral.InvertViewportDrag ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_THEMES_BUTTON:
@ -1636,7 +1636,7 @@ private:
{
ThemeManagerSetActiveAvailableTheme(dropdownIndex);
}
config_save_default();
ConfigSaveDefault();
break;
}
}
@ -1670,23 +1670,23 @@ private:
{
case WIDX_REAL_NAME_CHECKBOX:
gConfigGeneral.ShowRealNamesOfGuests ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
peep_update_names(gConfigGeneral.ShowRealNamesOfGuests);
break;
case WIDX_AUTO_STAFF_PLACEMENT:
gConfigGeneral.AutoStaffPlacement ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_SCENARIO_UNLOCKING:
gConfigGeneral.ScenarioUnlockingEnabled ^= 1;
config_save_default();
ConfigSaveDefault();
window_close_by_class(WindowClass::ScenarioSelect);
break;
case WIDX_AUTO_OPEN_SHOPS:
gConfigGeneral.AutoOpenShops = !gConfigGeneral.AutoOpenShops;
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_ALLOW_EARLY_COMPLETION:
@ -1699,7 +1699,7 @@ private:
ScenarioSetSetting::AllowEarlyCompletion, gConfigGeneral.AllowEarlyCompletion);
GameActions::Execute(&setAllowEarlyCompletionAction);
}
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
}
@ -1775,13 +1775,13 @@ private:
{
gConfigInterface.RandomTitleSequence = false;
title_sequence_change_preset(static_cast<size_t>(dropdownIndex));
config_save_default();
ConfigSaveDefault();
Invalidate();
}
else if (dropdownIndex == numItems + 1)
{
gConfigInterface.RandomTitleSequence = true;
config_save_default();
ConfigSaveDefault();
Invalidate();
}
break;
@ -1790,7 +1790,7 @@ private:
if (dropdownIndex != gConfigGeneral.DefaultInspectionInterval)
{
gConfigGeneral.DefaultInspectionInterval = static_cast<uint8_t>(dropdownIndex);
config_save_default();
ConfigSaveDefault();
Invalidate();
}
break;
@ -1799,7 +1799,7 @@ private:
{
gConfigGeneral.ScenarioSelectMode = dropdownIndex;
gConfigInterface.ScenarioselectLastTab = 0;
config_save_default();
ConfigSaveDefault();
Invalidate();
window_close_by_class(WindowClass::ScenarioSelect);
}
@ -1870,22 +1870,22 @@ private:
{
case WIDX_DEBUGGING_TOOLS:
gConfigGeneral.DebuggingTools ^= 1;
config_save_default();
ConfigSaveDefault();
gfx_invalidate_screen();
break;
case WIDX_SAVE_PLUGIN_DATA_CHECKBOX:
gConfigGeneral.SavePluginData ^= 1;
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_STAY_CONNECTED_AFTER_DESYNC:
gConfigNetwork.StayConnected = !gConfigNetwork.StayConnected;
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_ALWAYS_NATIVE_LOADSAVE:
gConfigGeneral.UseNativeBrowseDialog = !gConfigGeneral.UseNativeBrowseDialog;
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_PATH_TO_RCT1_BUTTON:
@ -1903,7 +1903,7 @@ private:
{
gConfigGeneral.RCT1Path = std::move(rct1path);
gConfigInterface.ScenarioselectLastTab = 0;
config_save_default();
ConfigSaveDefault();
context_show_error(STR_RESTART_REQUIRED, STR_NONE, {});
}
else
@ -1928,7 +1928,7 @@ private:
if (!gConfigGeneral.RCT1Path.empty())
{
gConfigGeneral.RCT1Path.clear();
config_save_default();
ConfigSaveDefault();
}
Invalidate();
break;
@ -1956,7 +1956,7 @@ private:
break;
case WIDX_AUTOSAVE_AMOUNT_UP:
gConfigGeneral.AutosaveAmount += 1;
config_save_default();
ConfigSaveDefault();
InvalidateWidget(WIDX_AUTOSAVE_FREQUENCY);
InvalidateWidget(WIDX_AUTOSAVE_FREQUENCY_DROPDOWN);
InvalidateWidget(WIDX_AUTOSAVE_AMOUNT);
@ -1965,7 +1965,7 @@ private:
if (gConfigGeneral.AutosaveAmount > 1)
{
gConfigGeneral.AutosaveAmount -= 1;
config_save_default();
ConfigSaveDefault();
InvalidateWidget(WIDX_AUTOSAVE_FREQUENCY);
InvalidateWidget(WIDX_AUTOSAVE_FREQUENCY_DROPDOWN);
InvalidateWidget(WIDX_AUTOSAVE_AMOUNT);
@ -1981,7 +1981,7 @@ private:
if (dropdownIndex != gConfigGeneral.AutosaveFrequency)
{
gConfigGeneral.AutosaveFrequency = static_cast<uint8_t>(dropdownIndex);
config_save_default();
ConfigSaveDefault();
Invalidate();
}
break;
@ -2113,7 +2113,7 @@ private:
void UpdateHeightMarkers()
{
config_save_default();
ConfigSaveDefault();
gfx_invalidate_screen();
}

2
src/openrct2-ui/windows/ScenarioSelect.cpp
View File

@ -272,7 +272,7 @@ static void WindowScenarioselectMousedown(rct_window* w, WidgetIndex widgetIndex
w->selected_tab = widgetIndex - 4;
w->highlighted_scenario = nullptr;
gConfigInterface.ScenarioselectLastTab = w->selected_tab;
config_save_default();
ConfigSaveDefault();
InitialiseListItems(w);
w->Invalidate();
window_event_resize_call(w);

2
src/openrct2-ui/windows/ServerList.cpp
View File

@ -323,7 +323,7 @@ static void WindowServerListTextinput(rct_window* w, WidgetIndex widgetIndex, ch
if (_playerName[0] != '\0')
{
gConfigNetwork.PlayerName = _playerName;
config_save_default();
ConfigSaveDefault();
}
widget_invalidate(*w, WIDX_PLAYER_NAME_INPUT);

14
src/openrct2-ui/windows/ServerStart.cpp
View File

@ -116,7 +116,7 @@ public:
{
gConfigNetwork.Maxplayers++;
}
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_MAXPLAYERS_DECREASE:
@ -124,12 +124,12 @@ public:
{
gConfigNetwork.Maxplayers--;
}
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_ADVERTISE_CHECKBOX:
gConfigNetwork.Advertise = !gConfigNetwork.Advertise;
config_save_default();
ConfigSaveDefault();
Invalidate();
break;
case WIDX_START_SERVER:
@ -185,7 +185,7 @@ public:
}
gConfigNetwork.DefaultPort = atoi(_port);
config_save_default();
ConfigSaveDefault();
widget_invalidate(*this, WIDX_NAME_INPUT);
break;
@ -202,7 +202,7 @@ public:
if (_name[0] != '\0')
{
gConfigNetwork.ServerName = _name;
config_save_default();
ConfigSaveDefault();
}
widget_invalidate(*this, WIDX_NAME_INPUT);
@ -220,7 +220,7 @@ public:
if (_description[0] != '\0')
{
gConfigNetwork.ServerDescription = _description;
config_save_default();
ConfigSaveDefault();
}
widget_invalidate(*this, WIDX_DESCRIPTION_INPUT);
@ -238,7 +238,7 @@ public:
if (_greeting[0] != '\0')
{
gConfigNetwork.ServerGreeting = _greeting;
config_save_default();
ConfigSaveDefault();
}
widget_invalidate(*this, WIDX_GREETING_INPUT);

2
src/openrct2-ui/windows/TopToolbar.cpp
View File

@ -3723,7 +3723,7 @@ static void TopToolbarViewMenuDropdown(int16_t dropdownIndex)
break;
case DDIDX_TRANSPARENT_WATER:
gConfigGeneral.TransparentWater ^= 1;
config_save_default();
ConfigSaveDefault();
break;
case DDIDX_HIDE_BASE:
w->viewport->flags ^= VIEWPORT_FLAG_HIDE_BASE;

2
src/openrct2-ui/windows/Transparency.cpp
View File

@ -240,7 +240,7 @@ private:
gConfigGeneral.InvisibleTrees = wflags & VIEWPORT_FLAG_INVISIBLE_VEGETATION;
gConfigGeneral.InvisiblePaths = wflags & VIEWPORT_FLAG_INVISIBLE_PATHS;
gConfigGeneral.InvisibleSupports = wflags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS;
config_save_default();
ConfigSaveDefault();
}
};

2
src/openrct2/AssetPackManager.cpp
View File

@ -198,5 +198,5 @@ void AssetPackManager::SaveEnabledAssetPacks()
enabledList.pop_back();
gConfigGeneral.AssetPackOrder = orderList;
gConfigGeneral.EnabledAssetPacks = enabledList;
config_save_default();
ConfigSaveDefault();
}

12
src/openrct2/Context.cpp
View File

@ -199,7 +199,7 @@ namespace OpenRCT2
gfx_unload_g2();
gfx_unload_g1();
Audio::Close();
config_release();
ConfigRelease();
Instance = nullptr;
}
@ -345,7 +345,7 @@ namespace OpenRCT2
{
gOpenRCT2ShowChangelog = true;
gConfigGeneral.LastRunVersion = OPENRCT2_VERSION;
config_save_default();
ConfigSaveDefault();
}
try
@ -513,7 +513,7 @@ namespace OpenRCT2
// Fallback to software
gConfigGeneral.DrawingEngine = DrawingEngine::Software;
config_save_default();
ConfigSaveDefault();
drawing_engine_init();
}
}
@ -541,7 +541,7 @@ namespace OpenRCT2
// Fallback to software
gConfigGeneral.DrawingEngine = DrawingEngine::Software;
config_save_default();
ConfigSaveDefault();
drawing_engine_init();
}
}
@ -816,9 +816,9 @@ namespace OpenRCT2
{
log_verbose(
"install directory does not exist or invalid directory selected, %s", gConfigGeneral.RCT2Path.c_str());
if (!config_find_or_browse_install_directory())
if (!ConfigFindOrBrowseInstallDirectory())
{
auto path = config_get_default_path();
auto path = ConfigGetDefaultPath();
Console::Error::WriteLine(
"An RCT2 install directory must be specified! Please edit \"game_path\" in %s.\n", path.c_str());
return std::string();

6
src/openrct2/PlatformEnvironment.cpp
View File

@ -205,10 +205,10 @@ std::unique_ptr<IPlatformEnvironment> OpenRCT2::CreatePlatformEnvironment()
// Now load the config so we can get the RCT1 and RCT2 paths
auto configPath = env->GetFilePath(PATHID::CONFIG);
config_set_defaults();
if (!config_open(configPath))
ConfigSetDefaults();
if (!ConfigOpen(configPath))
{
config_save(configPath);
ConfigSave(configPath);
}
if (gCustomRCT1DataPath.empty())
{

2
src/openrct2/Version.cpp
View File

@ -89,7 +89,7 @@ NewVersionInfo get_latest_version()
verinfo.url = Json::GetString(root["html_url"]);
gConfigGeneral.LastVersionCheckTime = now;
config_save_default();
ConfigSaveDefault();
}
#endif
return verinfo;

2
src/openrct2/actions/SetCheatAction.cpp
View File

@ -250,7 +250,7 @@ GameActions::Result SetCheatAction::Execute() const
if (network_get_mode() == NETWORK_MODE_NONE)
{
config_save_default();
ConfigSaveDefault();
}
window_invalidate_by_class(WindowClass::Cheats);

2
src/openrct2/audio/Audio.cpp
View File

@ -365,7 +365,7 @@ namespace OpenRCT2::Audio
}
_currentAudioDevice = device;
config_save_default();
ConfigSaveDefault();
}
void Close()

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

@ -368,10 +368,10 @@ static exitcode_t HandleCommandSetRCT2(CommandLineArgEnumerator* enumerator)
// Update RCT2 path in config
auto env = OpenRCT2::CreatePlatformEnvironment();
auto configPath = env->GetFilePath(OpenRCT2::PATHID::CONFIG);
config_set_defaults();
config_open(configPath);
ConfigSetDefaults();
ConfigOpen(configPath);
gConfigGeneral.RCT2Path = path;
if (config_save(configPath))
if (ConfigSave(configPath))
{
Console::WriteFormat("Updating RCT2 path to '%s'.", path.c_str());
Console::WriteLine();

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

@ -773,20 +773,20 @@ NotificationConfiguration gConfigNotifications;
FontConfiguration gConfigFonts;
PluginConfiguration gConfigPlugin;
void config_set_defaults()
void ConfigSetDefaults()
{
config_release();
ConfigRelease();
Config::SetDefaults();
}
bool config_open(u8string_view path)
bool ConfigOpen(u8string_view path)
{
if (!File::Exists(path))
{
return false;
}
config_release();
ConfigRelease();
auto result = Config::ReadFile(path);
if (result)
{
@ -795,12 +795,12 @@ bool config_open(u8string_view path)
return result;
}
bool config_save(u8string_view path)
bool ConfigSave(u8string_view path)
{
return Config::WriteFile(path);
}
void config_release()
void ConfigRelease()
{
SafeFree(gConfigGeneral.CustomCurrencySymbol);
SafeFree(gConfigInterface.CurrentThemePreset);
@ -809,19 +809,19 @@ void config_release()
SafeFree(gConfigFonts.FontName);
}
u8string config_get_default_path()
u8string ConfigGetDefaultPath()
{
auto env = GetContext()->GetPlatformEnvironment();
return Path::Combine(env->GetDirectoryPath(DIRBASE::USER), u8"config.ini");
}
bool config_save_default()
bool ConfigSaveDefault()
{
auto path = config_get_default_path();
return config_save(path);
auto path = ConfigGetDefaultPath();
return ConfigSave(path);
}
bool config_find_or_browse_install_directory()
bool ConfigFindOrBrowseInstallDirectory()
{
std::string path = Config::FindRCT2Path();
if (!path.empty())

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

@ -264,13 +264,13 @@ extern NotificationConfiguration gConfigNotifications;
extern FontConfiguration gConfigFonts;
extern PluginConfiguration gConfigPlugin;
bool config_open(u8string_view path);
bool config_save(u8string_view path);
u8string config_get_default_path();
void config_set_defaults();
void config_release();
bool config_save_default();
bool config_find_or_browse_install_directory();
bool ConfigOpen(u8string_view path);
bool ConfigSave(u8string_view path);
u8string ConfigGetDefaultPath();
void ConfigSetDefaults();
void ConfigRelease();
bool ConfigSaveDefault();
bool ConfigFindOrBrowseInstallDirectory();
bool RCT1DataPresentAtLocation(u8string_view path);
std::string FindCsg1datAtLocation(u8string_view path);

2
src/openrct2/drawing/Drawing.cpp
View File

@ -861,5 +861,5 @@ void ToggleWindowedMode()
int32_t targetMode = gConfigGeneral.FullscreenMode == 0 ? 2 : 0;
context_set_fullscreen_mode(targetMode);
gConfigGeneral.FullscreenMode = targetMode;
config_save_default();
ConfigSaveDefault();
}

10
src/openrct2/interface/InteractiveConsole.cpp
View File

@ -1049,7 +1049,7 @@ static int32_t cc_set(InteractiveConsole& console, const arguments_t& argv)
else if (argv[0] == "console_small_font" && invalidArguments(&invalidArgs, int_valid[0]))
{
gConfigInterface.ConsoleSmallFont = (int_val[0] != 0);
config_save_default();
ConfigSaveDefault();
console.Execute("get console_small_font");
}
else if (argv[0] == "location" && invalidArguments(&invalidArgs, int_valid[0] && int_valid[1]))
@ -1068,7 +1068,7 @@ static int32_t cc_set(InteractiveConsole& console, const arguments_t& argv)
{
float newScale = static_cast<float>(0.001 * std::trunc(1000 * double_val[0]));
gConfigGeneral.WindowScale = std::clamp(newScale, 0.5f, 5.0f);
config_save_default();
ConfigSaveDefault();
gfx_invalidate_screen();
context_trigger_resize();
context_update_cursor_scale();
@ -1082,13 +1082,13 @@ static int32_t cc_set(InteractiveConsole& console, const arguments_t& argv)
else if (argv[0] == "render_weather_effects" && invalidArguments(&invalidArgs, int_valid[0]))
{
gConfigGeneral.RenderWeatherEffects = (int_val[0] != 0);
config_save_default();
ConfigSaveDefault();
console.Execute("get render_weather_effects");
}
else if (argv[0] == "render_weather_gloom" && invalidArguments(&invalidArgs, int_valid[0]))
{
gConfigGeneral.RenderWeatherGloom = (int_val[0] != 0);
config_save_default();
ConfigSaveDefault();
console.Execute("get render_weather_gloom");
}
else if (argv[0] == "cheat_sandbox_mode" && invalidArguments(&invalidArgs, int_valid[0]))
@ -1172,7 +1172,7 @@ static int32_t cc_set(InteractiveConsole& console, const arguments_t& argv)
else if (argv[0] == "enable_hinting" && invalidArguments(&invalidArgs, int_valid[0]))
{
gConfigFonts.EnableHinting = (int_val[0] != 0);
config_save_default();
ConfigSaveDefault();
console.Execute("get enable_hinting");
ttf_toggle_hinting();
}

2
src/openrct2/interface/Window.cpp
View File

@ -189,7 +189,7 @@ void window_set_window_limit(int32_t value)
int32_t prev = gConfigGeneral.WindowLimit;
int32_t val = std::clamp(value, WINDOW_LIMIT_MIN, WINDOW_LIMIT_MAX);
gConfigGeneral.WindowLimit = val;
config_save_default();
ConfigSaveDefault();
// Checks if value decreases and then closes surplus
// windows if one sets a limit lower than the number of windows open
if (val < prev)

2
src/openrct2/platform/Crash.cpp
View File

@ -198,7 +198,7 @@ static bool OnCrash(
}
auto configFilePathUTF8 = String::ToUtf8(configFilePath);
if (config_save(configFilePathUTF8))
if (ConfigSave(configFilePathUTF8))
{
_uploadFiles[L"attachment_config.ini"] = configFilePath;
}