(svn r3924) - Revert r3923, apparently we are not fond of CONDNULL() structs :)
authorDarkvater
Fri, 17 Mar 2006 19:52:12 +0000
changeset 3245 a4845d49b6bd
parent 3244 e0d9b3d33d42
child 3246 512d9f9ce1e4
(svn r3924) - Revert r3923, apparently we are not fond of CONDNULL() structs :)
settings.c
--- a/settings.c	Fri Mar 17 18:54:42 2006 +0000
+++ b/settings.c	Fri Mar 17 19:52:12 2006 +0000
@@ -1302,7 +1302,6 @@
 	/* This is the penalty for level crossings, for both road and rail vehicles */
 	SDT_VAR(Patches, npf_crossing_penalty,          SLE_UINT, 0, 0, (3 * NPF_TILE_LENGTH),  0, 100000, STR_NULL, NULL),
 
-	SDT_CONDNULL(32, 0, SL_MAX_VERSION),
 	SDT_END()
 };
 
@@ -1564,9 +1563,6 @@
 	/* Copy over default setting since some might not get loaded in
 	 * a networking environment. This ensures for example that the local
 	 * signal_side stays when joining a network-server */
-	size_t length = SlGetFieldLength();
-	for (; length != 0; length--) SlReadByte();
-	return;
 	_patches = _patches_newgame;
 	LoadSettings(_patch_settings, &_patches);
 }