dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix load check of a savegame with realistic braking enabled triggering signal checks on current game

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-05-26 01:13:46 +01:00
parent 13cdef2a2d
commit 730b84e262
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/settings.cpp
View File

@@ -463,7 +463,7 @@ size_t BoolSettingDesc::ParseValue(const char *str) const
static bool ValidateEnumSetting(const IntSettingDesc *sdb, int32 &val) static bool ValidateEnumSetting(const IntSettingDesc *sdb, int32 &val)
{ {
if (sdb->pre_check != nullptr && !sdb->pre_check(val)) return false; if (sdb->flags & SF_ENUM_PRE_CB_VALIDATE && sdb->pre_check != nullptr && !sdb->pre_check(val)) return false;
for (const SettingDescEnumEntry *enumlist = sdb->enumlist; enumlist != nullptr && enumlist->str != STR_NULL; enumlist++) { for (const SettingDescEnumEntry *enumlist = sdb->enumlist; enumlist != nullptr && enumlist->str != STR_NULL; enumlist++) {
if (enumlist->val == val) { if (enumlist->val == val) {
return true; return true;

1
src/settings_internal.h
View File

@@ -34,6 +34,7 @@ enum SettingFlag : uint32 {
SF_RUN_CALLBACKS_ON_PARSE = 1 << 17, ///< run callbacks when parsing from config file SF_RUN_CALLBACKS_ON_PARSE = 1 << 17, ///< run callbacks when parsing from config file
SF_GUI_VELOCITY = 1 << 18, ///< setting value is a velocity SF_GUI_VELOCITY = 1 << 18, ///< setting value is a velocity
SF_GUI_ADVISE_DEFAULT = 1 << 19, ///< Advise the user to leave this setting at its default value SF_GUI_ADVISE_DEFAULT = 1 << 19, ///< Advise the user to leave this setting at its default value
SF_ENUM_PRE_CB_VALIDATE = 1 << 20, ///< Call the pre_check callback for enum incoming value validation
}; };
DECLARE_ENUM_AS_BIT_SET(SettingFlag) DECLARE_ENUM_AS_BIT_SET(SettingFlag)

1
src/table/settings/settings.ini
View File

@@ -436,6 +436,7 @@ cat = SC_BASIC
var = difficulty.town_council_tolerance var = difficulty.town_council_tolerance
type = SLE_UINT8 type = SLE_UINT8
from = SLV_97 from = SLV_97
flags = SF_ENUM_PRE_CB_VALIDATE
def = 0 def = 0
enumlist = _town_council_approval enumlist = _town_council_approval
str = STR_CONFIG_SETTING_CITY_APPROVAL str = STR_CONFIG_SETTING_CITY_APPROVAL