diff options
| -rw-r--r-- | settings.c | 6 | ||||
| -rw-r--r-- | yapf/yapf_settings.h | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/settings.c b/settings.c index b1691f4bc..bf11f8e45 100644 --- a/settings.c +++ b/settings.c @@ -1408,8 +1408,10 @@ const SettingDesc _patch_settings[] = { SDT_CONDVAR (Patches, yapf.rail_look_ahead_signal_p1 , SLE_INT , 28, SL_MAX_VERSION, 0, 0, -100 , -1000000, 1000000, STR_NULL, NULL), SDT_CONDVAR (Patches, yapf.rail_look_ahead_signal_p2 , SLE_INT , 28, SL_MAX_VERSION, 0, 0, 5 , -1000000, 1000000, STR_NULL, NULL), // penalties for too long or too short station platforms (TODO: NS flag or higher revision?) - SDT_CONDVAR (Patches, yapf.rail_longer_platform_penalty, SLE_UINT, 28, SL_MAX_VERSION,NS, 0, 8 * YAPF_TILE_LENGTH, 0, 20000, STR_NULL, NULL), - SDT_CONDVAR (Patches, yapf.rail_shorter_platform_penalty, SLE_UINT, 28, SL_MAX_VERSION,NS, 0, 40 * YAPF_TILE_LENGTH, 0, 20000, STR_NULL, NULL), + SDT_CONDVAR (Patches, yapf.rail_longer_platform_penalty, SLE_UINT, 29, SL_MAX_VERSION, 0, 0, 8 * YAPF_TILE_LENGTH, 0, 20000, STR_NULL, NULL), + SDT_CONDVAR (Patches, yapf.rail_longer_platform_per_tile_penalty, SLE_UINT, 29, SL_MAX_VERSION, 0, 0, 0 * YAPF_TILE_LENGTH, 0, 20000, STR_NULL, NULL), + SDT_CONDVAR (Patches, yapf.rail_shorter_platform_penalty, SLE_UINT, 29, SL_MAX_VERSION, 0, 0, 40 * YAPF_TILE_LENGTH, 0, 20000, STR_NULL, NULL), + SDT_CONDVAR (Patches, yapf.rail_shorter_platform_per_tile_penalty, SLE_UINT, 29, SL_MAX_VERSION, 0, 0, 0 * YAPF_TILE_LENGTH, 0, 20000, STR_NULL, NULL), SDT_END() }; diff --git a/yapf/yapf_settings.h b/yapf/yapf_settings.h index 475c7acc8..3db44547e 100644 --- a/yapf/yapf_settings.h +++ b/yapf/yapf_settings.h @@ -52,8 +52,10 @@ YS_DEF_BEGIN YS_DEF(int32 , rail_look_ahead_signal_p1) ///< constant in polynomial penalty function YS_DEF(int32 , rail_look_ahead_signal_p2) ///< constant in polynomial penalty function - YS_DEF(uint32, rail_longer_platform_penalty) ///< penalty for longer station platform than train - YS_DEF(uint32, rail_shorter_platform_penalty) ///< penalty for shorter station platform than train + YS_DEF(uint32, rail_longer_platform_penalty) ///< penalty for longer station platform than train + YS_DEF(uint32, rail_longer_platform_per_tile_penalty) ///< penalty for longer station platform than train (per tile) + YS_DEF(uint32, rail_shorter_platform_penalty) ///< penalty for shorter station platform than train + YS_DEF(uint32, rail_shorter_platform_per_tile_penalty) ///< penalty for shorter station platform than train (per tile) YS_DEF_END; #undef YS_DEF_BEGIN |