mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-21 03:12:41 +01:00
Code Issues Releases Wiki Activity

Codechange: Correct return type of GetDefaultValueCallback

Browse Source
This commit is contained in:
André Cheng
2024-04-13 17:33:27 +01:00
committed by rubidium42
parent 339b0ea0ff
commit ceb0053dd9
4 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/settings_gui.cpp
View File

@@ -2498,8 +2498,7 @@ struct GameSettingsWindow : Window {
DrawString(tr, STR_CONFIG_SETTING_TYPE);
tr.top += GetCharacterHeight(FS_NORMAL);
int32_t def_val = sd->def;
if (sd->get_def_cb != nullptr) sd->get_def_cb(def_val);
int32_t def_val = sd->get_def_cb != nullptr ? sd->get_def_cb() : sd->def;
sd->SetValueDParams(0, def_val);
DrawString(tr, STR_CONFIG_SETTING_DEFAULT_VALUE);
tr.top += GetCharacterHeight(FS_NORMAL) + WidgetDimensions::scaled.vsep_normal;
@@ -2734,9 +2733,10 @@ struct GameSettingsWindow : Window {
if (sd->flags & SF_GUI_CURRENCY) llvalue /= GetCurrency().rate;
value = ClampTo<int32_t>(llvalue);
} else if (sd->get_def_cb != nullptr) {
value = sd->get_def_cb();
} else {
value = sd->def;
if (sd->get_def_cb != nullptr) sd->get_def_cb(value);
}
SetSettingValue(this->valuewindow_entry->setting, value);