Mercurial Mercurial > openttd-ottdgrfs / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
(svn r6296) -Fix (r6186): some more (YAPF) settings were affected by accident. Thanks to mart3p for noticing (and to SVN for failing to mark the changes as conflicts).
authorrubidium
Fri, 01 Sep 2006 13:18:53 +0000
changeset 4511 111a4b4f2143
parent 4510 071bca98c577
child 4512 7151d4ee3a0f
(svn r6296) -Fix (r6186): some more (YAPF) settings were affected by accident. Thanks to mart3p for noticing (and to SVN for failing to mark the changes as conflicts).
settings.c file | annotate | diff | comparison | revisions 
--- a/settings.c	Fri Sep 01 12:37:03 2006 +0000
+++ b/settings.c	Fri Sep 01 13:18:53 2006 +0000
@@ -1430,13 +1430,14 @@
 	SDT_CONDVAR (Patches, yapf.rail_look_ahead_signal_p1  , SLE_INT , 28, SL_MAX_VERSION, 0, 0,  -100                   , -1000000, 1000000, 0, STR_NULL, NULL),
 	SDT_CONDVAR (Patches, yapf.rail_look_ahead_signal_p2  , SLE_INT , 28, SL_MAX_VERSION, 0, 0,     5                   , -1000000, 1000000, 0, 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, 0, STR_NULL, NULL),
-	SDT_CONDVAR (Patches, yapf.rail_longer_platform_per_tile_penalty,  SLE_UINT, 28, SL_MAX_VERSION,NS, 0,   0 * YAPF_TILE_LENGTH,        0,   20000, 0, 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, 0, STR_NULL, NULL),
-	SDT_CONDVAR (Patches, yapf.rail_shorter_platform_per_tile_penalty, SLE_UINT, 28, SL_MAX_VERSION,NS, 0,   0 * YAPF_TILE_LENGTH,        0,   20000, 0, STR_NULL, NULL),
+	SDT_VAR     (Patches, yapf.rail_longer_platform_penalty,           SLE_UINT,         NS, 0,     8 * YAPF_TILE_LENGTH,        0,   20000, 0, STR_NULL, NULL),
+	SDT_VAR     (Patches, yapf.rail_longer_platform_per_tile_penalty,  SLE_UINT,         NS, 0,     0 * YAPF_TILE_LENGTH,        0,   20000, 0, STR_NULL, NULL),
+	SDT_VAR     (Patches, yapf.rail_shorter_platform_penalty,          SLE_UINT,         NS, 0,    40 * YAPF_TILE_LENGTH,        0,   20000, 0, STR_NULL, NULL),
+	SDT_VAR     (Patches, yapf.rail_shorter_platform_per_tile_penalty, SLE_UINT,         NS, 0,     0 * YAPF_TILE_LENGTH,        0,   20000, 0, STR_NULL, NULL),
 	// road vehicles - penalties
-	SDT_CONDVAR (Patches, yapf.road_slope_penalty                    , SLE_UINT, 28, SL_MAX_VERSION,NS, 0,   2 * YAPF_TILE_LENGTH,        0, 1000000, 0, STR_NULL, NULL),
-	SDT_CONDVAR (Patches, yapf.road_crossing_penalty                 , SLE_UINT, 28, SL_MAX_VERSION,NS, 0,   3 * YAPF_TILE_LENGTH,        0, 1000000, 0, STR_NULL, NULL),
+	SDT_VAR     (Patches, yapf.road_slope_penalty                    , SLE_UINT,         NS, 0,     2 * YAPF_TILE_LENGTH,        0, 1000000, 0, STR_NULL, NULL),
+	SDT_VAR     (Patches, yapf.road_curve_penalty                    , SLE_UINT,         NS, 0,     1 * YAPF_TILE_LENGTH,        0, 1000000, 0, STR_NULL, NULL),
+	SDT_VAR     (Patches, yapf.road_crossing_penalty                 , SLE_UINT,         NS, 0,     3 * YAPF_TILE_LENGTH,        0, 1000000, 0, STR_NULL, NULL),
 
 	/***************************************************************************/
 	/* Terrain genation related patch options */
openttd-ottdgrfs