gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-11 01:49:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: IntSettingDesc may have a callback for default value (#13240)

Browse Source
This commit is contained in:
Loïc Guilloux 2025-01-03 15:05:56 +01:00 committed by GitHub
parent c972a9ae1f
commit b3660bf24a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/settings.cpp
View File

@ -385,7 +385,7 @@ size_t IntSettingDesc::ParseValue(const char *str) const
msg.SetDParamStr(0, str);
msg.SetDParamStr(1, this->GetName());
_settings_error_list.push_back(msg);
return this->def;
return this->GetDefaultValue();
}
if (*end != '\0') {
ErrorMessageData msg(STR_CONFIG_ERROR, STR_CONFIG_ERROR_TRAILING_CHARACTERS);
@ -407,7 +407,7 @@ size_t OneOfManySettingDesc::ParseValue(const char *str) const
msg.SetDParamStr(0, str);
msg.SetDParamStr(1, this->GetName());
_settings_error_list.push_back(msg);
return this->def;
return this->GetDefaultValue();
}
size_t ManyOfManySettingDesc::ParseValue(const char *str) const
@ -418,7 +418,7 @@ size_t ManyOfManySettingDesc::ParseValue(const char *str) const
msg.SetDParamStr(0, str);
msg.SetDParamStr(1, this->GetName());
_settings_error_list.push_back(msg);
return this->def;
return this->GetDefaultValue();
}
size_t BoolSettingDesc::ParseValue(const char *str) const
@ -430,7 +430,7 @@ size_t BoolSettingDesc::ParseValue(const char *str) const
msg.SetDParamStr(0, str);
msg.SetDParamStr(1, this->GetName());
_settings_error_list.push_back(msg);
return this->def;
return this->GetDefaultValue();
}
/**
@ -473,6 +473,15 @@ void IntSettingDesc::SetValueDParams(uint first_param, int32_t value) const
}
}
/**
* Get the default value of the setting.
* @return The default value.
*/
int32_t IntSettingDesc::GetDefaultValue() const
{
return this->get_def_cb != nullptr ? this->get_def_cb() : this->def;
}
/**
* Make the value valid and then write it to the setting.
* See #MakeValidValid and #Write for more details.
@ -516,7 +525,7 @@ void IntSettingDesc::MakeValueValid(int32_t &val) const
val = Clamp(val, this->min, this->max);
} else if (val < this->min || val > (int32_t)this->max) {
/* Reset invalid discrete setting (where different values change gameplay) to its default value */
val = this->def;
val = this->GetDefaultValue();
}
}
break;
@ -530,7 +539,7 @@ void IntSettingDesc::MakeValueValid(int32_t &val) const
uval = ClampU(uval, this->min, this->max);
} else if (uval < (uint)this->min || uval > this->max) {
/* Reset invalid discrete setting to its default value */
uval = (uint32_t)this->def;
uval = (uint32_t)this->GetDefaultValue();
}
}
val = (int32_t)uval;
@ -654,7 +663,7 @@ static void IniLoadSettings(IniFile &ini, const SettingTable &settings_table, co
void IntSettingDesc::ParseValue(const IniItem *item, void *object) const
{
size_t val = (item == nullptr) ? this->def : this->ParseValue(item->value.has_value() ? item->value->c_str() : "");
size_t val = (item == nullptr) ? this->GetDefaultValue() : this->ParseValue(item->value.has_value() ? item->value->c_str() : "");
this->MakeValueValidAndWrite(object, (int32_t)val);
}
@ -749,12 +758,12 @@ bool IntSettingDesc::IsSameValue(const IniItem *item, void *object) const
bool IntSettingDesc::IsDefaultValue(void *object) const
{
int32_t object_value = this->Read(object);
return this->def == object_value;
return this->GetDefaultValue() == object_value;
}
void IntSettingDesc::ResetToDefault(void *object) const
{
this->Write(object, this->def);
this->Write(object, this->GetDefaultValue());
}
std::string StringSettingDesc::FormatValue(const void *object) const
@ -1783,9 +1792,10 @@ bool SetSettingValue(const IntSettingDesc *sd, int32_t value, bool force_newgame
void SetDefaultCompanySettings(CompanyID cid)
{
Company *c = Company::Get(cid);
AutoRestoreBackup backup(_current_company, cid);
for (auto &desc : _company_settings) {
const IntSettingDesc *int_setting = GetSettingDesc(desc)->AsIntSetting();
int_setting->MakeValueValidAndWrite(&c->settings, int_setting->def);
int_setting->MakeValueValidAndWrite(&c->settings, int_setting->GetDefaultValue());
}
}

11
src/settings_gui.cpp
View File

@ -1478,7 +1478,7 @@ void SettingEntry::Init(uint8_t level)
/* Sets the given setting entry to its default value */
void SettingEntry::ResetAll()
{
SetSettingValue(this->setting, this->setting->def);
SetSettingValue(this->setting, this->setting->GetDefaultValue());
}
/**
@ -1532,7 +1532,7 @@ bool SettingEntry::IsVisibleByRestrictionMode(RestrictionMode mode) const
/* This entry shall only be visible, if the value deviates from its default value. */
/* Read the default value. */
filter_value = sd->def;
filter_value = sd->GetDefaultValue();
} else {
assert(mode == RM_CHANGED_AGAINST_NEW);
/* This entry shall only be visible, if the value deviates from
@ -2508,8 +2508,7 @@ struct GameSettingsWindow : Window {
DrawString(tr, STR_CONFIG_SETTING_TYPE);
tr.top += GetCharacterHeight(FS_NORMAL);
int32_t def_val = sd->get_def_cb != nullptr ? sd->get_def_cb() : sd->def;
sd->SetValueDParams(0, def_val);
sd->SetValueDParams(0, sd->GetDefaultValue());
DrawString(tr, STR_CONFIG_SETTING_DEFAULT_VALUE);
tr.top += GetCharacterHeight(FS_NORMAL) + WidgetDimensions::scaled.vsep_normal;
@ -2743,10 +2742,8 @@ 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;
value = sd->GetDefaultValue();
}
SetSettingValue(this->valuewindow_entry->setting, value);

1
src/settings_internal.h
View File

@ -234,6 +234,7 @@ struct IntSettingDesc : SettingDesc {
StringID GetTitle() const;
StringID GetHelp() const;
void SetValueDParams(uint first_param, int32_t value) const;
int32_t GetDefaultValue() const;
/**
* Check whether this setting is a boolean type setting.