(svn r3775) Fix loading of server_port from config file, introduced in Darkvater's unified configuration changes (r3719+)
authorpeter1138
Mon, 06 Mar 2006 19:23:26 +0000
changeset 3152 00aa2d4cf39e
parent 3151 711ef4ea85e9
child 3153 e83501906eae
(svn r3775) Fix loading of server_port from config file, introduced in Darkvater's unified configuration changes (r3719+)
network.h
settings.c
--- a/network.h	Mon Mar 06 13:29:27 2006 +0000
+++ b/network.h	Mon Mar 06 19:23:26 2006 +0000
@@ -159,7 +159,7 @@
 // networking settings
 VARDEF uint32 _network_ip_list[MAX_INTERFACES + 1]; // Network IPs
 
-VARDEF uint _network_server_port;
+VARDEF uint16 _network_server_port;
 /* We use bind_ip and bind_ip_host, where bind_ip_host is the readable form of
     bind_ip_host, and bind_ip the numeric value, because we want a nice number
     in the openttd.cfg, but we wants to use the uint32 internally.. */
--- a/settings.c	Mon Mar 06 13:29:27 2006 +0000
+++ b/settings.c	Mon Mar 06 19:23:26 2006 +0000
@@ -1092,7 +1092,7 @@
 	 SDTG_VAR("max_join_time",       SLE_UINT16, S, 0, _network_max_join_time,        500, 0,32000,STR_NULL, NULL),
 	SDTG_BOOL("pause_on_join",                   S, 0, _network_pause_on_join,        false,       STR_NULL, NULL),
 	 SDTG_STR("server_bind_ip",        SLE_STRB, S, 0, _network_server_bind_ip_host,  "0.0.0.0",   STR_NULL, NULL),
-	 SDTG_VAR("server_port",         SLE_UINT16, S, 0, _network_server_port,          NETWORK_DEFAULT_PORT, 0, -1,STR_NULL, NULL),
+	 SDTG_VAR("server_port",         SLE_UINT16, S, 0, _network_server_port,          NETWORK_DEFAULT_PORT, 0, 65535,STR_NULL, NULL),
 	SDTG_BOOL("server_advertise",                S, 0, _network_advertise,            false,       STR_NULL, NULL),
 	SDTG_BOOL("lan_internet",                    S, 0, _network_lan_internet,         false,       STR_NULL, NULL),
 	 SDTG_STR("player_name",           SLE_STRB, S, 0, _network_player_name,          NULL,        STR_NULL, NULL),