@ -307,7 +307,7 @@ static const SettingDesc _gameopt_settings[] = {
SDTG_GENERAL ( " diff_custom " , SDT_INTLIST , SL_ARR , SLE_FILE_I16 | SLE_VAR_U16 , C , 0 , _old_diff_custom , 17 , 0 , 0 , 0 , 0 , NULL , STR_NULL , NULL , 0 , 3 ) ,
SDTG_GENERAL ( " diff_custom " , SDT_INTLIST , SL_ARR , SLE_FILE_I16 | SLE_VAR_U16 , C , 0 , _old_diff_custom , 17 , 0 , 0 , 0 , 0 , NULL , STR_NULL , NULL , 0 , 3 ) ,
SDTG_GENERAL ( " diff_custom " , SDT_INTLIST , SL_ARR , SLE_UINT16 , C , 0 , _old_diff_custom , 18 , 0 , 0 , 0 , 0 , NULL , STR_NULL , NULL , 4 , SL_MAX_VERSION ) ,
SDTG_GENERAL ( " diff_custom " , SDT_INTLIST , SL_ARR , SLE_UINT16 , C , 0 , _old_diff_custom , 18 , 0 , 0 , 0 , 0 , NULL , STR_NULL , NULL , 4 , SL_MAX_VERSION ) ,
SDT_VAR ( GameSettings , difficulty . diff_level , SLE_UINT8 , 0 , 0 , 0 , 0 , 3 , 0 , STR_NULL , NULL ) ,
SDT_VAR ( GameSettings , difficulty . diff_level , SLE_UINT8 , 0 , 0 , 3 , 0 , 3 , 0 , STR_NULL , NULL ) ,
SDT_OMANY ( GameSettings , locale . currency , SLE_UINT8 , N , 0 , 0 , CUSTOM_CURRENCY_ID , _locale_currencies , STR_NULL , NULL , NULL ) ,
SDT_OMANY ( GameSettings , locale . currency , SLE_UINT8 , N , 0 , 0 , CUSTOM_CURRENCY_ID , _locale_currencies , STR_NULL , NULL , NULL ) ,
SDT_OMANY ( GameSettings , locale . units , SLE_UINT8 , N , 0 , 1 , 2 , _locale_units , STR_NULL , NULL , NULL ) ,
SDT_OMANY ( GameSettings , locale . units , SLE_UINT8 , N , 0 , 1 , 2 , _locale_units , STR_NULL , NULL , NULL ) ,
/* There are only 21 predefined town_name values (0-20), but you can have more with newgrf action F so allow these bigger values (21-255). Invalid values will fallback to english on use and (undefined string) in GUI. */
/* There are only 21 predefined town_name values (0-20), but you can have more with newgrf action F so allow these bigger values (21-255). Invalid values will fallback to english on use and (undefined string) in GUI. */
@ -333,7 +333,7 @@ const SettingDesc _settings[] = {
/***************************************************************************/
/***************************************************************************/
/* Saved settings variables. */
/* Saved settings variables. */
/* Do not ADD or REMOVE something in this "difficulty.XXX" table or before it. It breaks savegame compatability. */
/* Do not ADD or REMOVE something in this "difficulty.XXX" table or before it. It breaks savegame compatability. */
SDT_CONDVAR ( GameSettings , difficulty . max_no_competitors , SLE_UINT8 , 97 , SL_MAX_VERSION , 0 , 0 , 2 , 0 , MAX_COMPANIES - 1 , 1 , STR_NULL , DifficultyChange ) ,
SDT_CONDVAR ( GameSettings , difficulty . max_no_competitors , SLE_UINT8 , 97 , SL_MAX_VERSION , 0 , 0 , 0 , 0 , MAX_COMPANIES - 1 , 1 , STR_NULL , DifficultyChange ) ,
SDT_CONDNULL ( 1 , 97 , 109 ) ,
SDT_CONDNULL ( 1 , 97 , 109 ) ,
SDT_CONDVAR ( GameSettings , difficulty . number_towns , SLE_UINT8 , 97 , SL_MAX_VERSION , 0 , NG , 2 , 0 , 4 , 1 , STR_NUM_VERY_LOW , DifficultyChange ) ,
SDT_CONDVAR ( GameSettings , difficulty . number_towns , SLE_UINT8 , 97 , SL_MAX_VERSION , 0 , NG , 2 , 0 , 4 , 1 , STR_NUM_VERY_LOW , DifficultyChange ) ,
SDT_CONDVAR ( GameSettings , difficulty . number_industries , SLE_UINT8 , 97 , SL_MAX_VERSION , 0 , NG , 4 , 0 , 4 , 1 , STR_NONE , DifficultyChange ) ,
SDT_CONDVAR ( GameSettings , difficulty . number_industries , SLE_UINT8 , 97 , SL_MAX_VERSION , 0 , NG , 4 , 0 , 4 , 1 , STR_NONE , DifficultyChange ) ,
@ -351,7 +351,7 @@ const SettingDesc _settings[] = {
SDT_CONDVAR ( GameSettings , difficulty . line_reverse_mode , SLE_UINT8 , 97 , SL_MAX_VERSION , 0 , 0 , 0 , 0 , 1 , 1 , STR_REVERSE_AT_END_OF_LINE_AND_AT_STATIONS , DifficultyChange ) ,
SDT_CONDVAR ( GameSettings , difficulty . line_reverse_mode , SLE_UINT8 , 97 , SL_MAX_VERSION , 0 , 0 , 0 , 0 , 1 , 1 , STR_REVERSE_AT_END_OF_LINE_AND_AT_STATIONS , DifficultyChange ) ,
SDT_CONDVAR ( GameSettings , difficulty . disasters , SLE_UINT8 , 97 , SL_MAX_VERSION , 0 , 0 , 0 , 0 , 1 , 1 , STR_DISASTERS_OFF , DifficultyChange ) ,
SDT_CONDVAR ( GameSettings , difficulty . disasters , SLE_UINT8 , 97 , SL_MAX_VERSION , 0 , 0 , 0 , 0 , 1 , 1 , STR_DISASTERS_OFF , DifficultyChange ) ,
SDT_CONDVAR ( GameSettings , difficulty . town_council_tolerance , SLE_UINT8 , 97 , SL_MAX_VERSION , 0 , 0 , 0 , 0 , 2 , 1 , STR_CITY_APPROVAL_PERMISSIVE , DifficultyNoiseChange ) ,
SDT_CONDVAR ( GameSettings , difficulty . town_council_tolerance , SLE_UINT8 , 97 , SL_MAX_VERSION , 0 , 0 , 0 , 0 , 2 , 1 , STR_CITY_APPROVAL_PERMISSIVE , DifficultyNoiseChange ) ,
SDT_CONDVAR ( GameSettings , difficulty . diff_level , SLE_UINT8 , 97 , SL_MAX_VERSION , 0 , NG , 0 , 0 , 3 , 0 , STR_NULL , DifficultyReset ) ,
SDT_CONDVAR ( GameSettings , difficulty . diff_level , SLE_UINT8 , 97 , SL_MAX_VERSION , 0 , NG , 3 , 0 , 3 , 0 , STR_NULL , DifficultyReset ) ,
/* There are only 21 predefined town_name values (0-20), but you can have more with newgrf action F so allow these bigger values (21-255). Invalid values will fallback to english on use and (undefined string) in GUI. */
/* There are only 21 predefined town_name values (0-20), but you can have more with newgrf action F so allow these bigger values (21-255). Invalid values will fallback to english on use and (undefined string) in GUI. */
SDT_CONDOMANY ( GameSettings , game_creation . town_name , SLE_UINT8 , 97 , SL_MAX_VERSION , 0 , NN , 0 , 255 , _town_names , STR_NULL , NULL , NULL ) ,
SDT_CONDOMANY ( GameSettings , game_creation . town_name , SLE_UINT8 , 97 , SL_MAX_VERSION , 0 , NN , 0 , 255 , _town_names , STR_NULL , NULL , NULL ) ,