summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2005-02-02 20:36:04 +0000
committertruelight <truelight@openttd.org>2005-02-02 20:36:04 +0000
commitf1d4a85f5989e65998c326864fa59dadf9065e47 (patch)
tree13a76c3613da918b4e994e6a8f26a0ca58351896
parentae3638121c497c260296f3194fc83149b560c17a (diff)
downloadopenttd-f1d4a85f5989e65998c326864fa59dadf9065e47.tar.xz
(svn r1775) -Fix: The NPF patch setting was not synced in network.
REMINDER FOR ALL DEVELOPERS: We do have 2 patch-setting-arrays: player-based, server-based. PLEASE put your new patch setting in the right one... thank you :)
-rw-r--r--settings.c54
1 files changed, 27 insertions, 27 deletions
diff --git a/settings.c b/settings.c
index ae7f9874e..4e299b7bb 100644
--- a/settings.c
+++ b/settings.c
@@ -823,33 +823,6 @@ static const SettingDesc patch_player_settings[] = {
{"window_snap_radius", SDT_UINT8, (void*)10, &_patches.window_snap_radius, NULL},
- /* New Path Finding */
- {"new_pathfinding_all", SDT_BOOL, (void*)false, &_patches.new_pathfinding_all, NULL},
-
- /* When a red signal is encountered, a small detour can be made around
- * it. This specifically occurs when a track is doubled, in which case
- * the detour is typically 2 tiles. It is also often used at station
- * entrances, when there is a choice of multiple platforms. If we take
- * a typical 4 platform station, the detour is 4 tiles. To properly
- * support larger stations we increase this value.
- * We want to prevent that trains that want to leave at one side of a
- * station, leave through the other side, turn around, enter the
- * station on another platform and exit the station on the right side
- * again, just because the sign at the right side was red. If we take
- * a typical 5 length station, this detour is 10 or 11 tiles (not
- * sure), so we set the default penalty at 10 (the station tile
- * penalty will further prevent this */
- {"npf_rail_firstred_penalty", SDT_UINT32, (void*)(10 * NPF_TILE_LENGTH), &_patches.npf_rail_firstred_penalty, NULL},
- /* When a train plans a route over a station tile, this penalty is
- * applied. We want that trains plan a route around a typical, 4x5
- * station, which means two tiles to the right, and two tiles back to
- * the left around it, or 5 tiles of station through it. If we assign
- * a penalty of 1 tile for every station tile passed, the route will
- * be around it.
- */
- {"npf_rail_station_penalty", SDT_UINT32, (void*)(1 * NPF_TILE_LENGTH), &_patches.npf_rail_station_penalty, NULL},
- {"npf_rail_slope_penalty", SDT_UINT32, (void*)(1 * NPF_TILE_LENGTH), &_patches.npf_rail_slope_penalty, NULL},
-
{"autorenew", SDT_BOOL, (void*)false, &_patches.autorenew, NULL},
{"autorenew_months", SDT_INT16, (void*)-6, &_patches.autorenew_months, NULL},
{"autorenew_money", SDT_INT32, (void*)100000,&_patches.autorenew_money, NULL},
@@ -940,6 +913,33 @@ const SettingDesc patch_settings[] = {
{"map_x", SDT_UINT32, (void*)8, &_patches.map_x, NULL},
{"map_y", SDT_UINT32, (void*)8, &_patches.map_y, NULL},
+ /* New Path Finding */
+ {"new_pathfinding_all", SDT_BOOL, (void*)false, &_patches.new_pathfinding_all, NULL},
+
+ /* When a red signal is encountered, a small detour can be made around
+ * it. This specifically occurs when a track is doubled, in which case
+ * the detour is typically 2 tiles. It is also often used at station
+ * entrances, when there is a choice of multiple platforms. If we take
+ * a typical 4 platform station, the detour is 4 tiles. To properly
+ * support larger stations we increase this value.
+ * We want to prevent that trains that want to leave at one side of a
+ * station, leave through the other side, turn around, enter the
+ * station on another platform and exit the station on the right side
+ * again, just because the sign at the right side was red. If we take
+ * a typical 5 length station, this detour is 10 or 11 tiles (not
+ * sure), so we set the default penalty at 10 (the station tile
+ * penalty will further prevent this */
+ {"npf_rail_firstred_penalty", SDT_UINT32, (void*)(10 * NPF_TILE_LENGTH), &_patches.npf_rail_firstred_penalty, NULL},
+ /* When a train plans a route over a station tile, this penalty is
+ * applied. We want that trains plan a route around a typical, 4x5
+ * station, which means two tiles to the right, and two tiles back to
+ * the left around it, or 5 tiles of station through it. If we assign
+ * a penalty of 1 tile for every station tile passed, the route will
+ * be around it.
+ */
+ {"npf_rail_station_penalty", SDT_UINT32, (void*)(1 * NPF_TILE_LENGTH), &_patches.npf_rail_station_penalty, NULL},
+ {"npf_rail_slope_penalty", SDT_UINT32, (void*)(1 * NPF_TILE_LENGTH), &_patches.npf_rail_slope_penalty, NULL},
+
{NULL, 0, NULL, NULL, NULL}
};