Merge 14.0-beta3

src/table/settings/citymania_settings.ini

@@ -3,7 +3,7 @@ static const SettingVariant _citymania_settings_table[] = {
 [post-amble]
 };
 [templates]
-SDT_VAR    =    SDT_VAR(GameSettings, $var, $type, $flags, $def,       $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to,        $cat, $extra, $startup),
+SDT_VAR    =    SDT_VAR(GameSettings, $var, $type, $flags, $def,       $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $str_cb, $help_cb, $val_cb, $from, $to,        $cat, $extra, $startup),
 
 [validation]
 SDT_VAR = static_assert($max <= MAX_$type, "Maximum value for GameSettings.$var exceeds storage size");
@@ -16,6 +16,9 @@ strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
 strval   = STR_NULL
 pre_cb   = nullptr
 post_cb  = nullptr
+str_cb   = nullptr
+help_cb  = nullptr
+val_cb   = nullptr
 load     = nullptr
 from     = SLV_TABLE_CHUNKS
 to       = SL_MAX_VERSION