From 995a4572ec150b21f4f2fa401d67f6f6ba75a10a Mon Sep 17 00:00:00 2001 From: peter1138 Date: Mon, 6 Mar 2006 19:23:26 +0000 Subject: [PATCH] (svn r3775) Fix loading of server_port from config file, introduced in Darkvater's unified configuration changes (r3719+) --- network.h | 2 +- settings.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/network.h b/network.h index f3602ea485..afa17adf36 100644 --- a/network.h +++ b/network.h @@ -159,7 +159,7 @@ VARDEF uint32 _last_sync_frame; // Used in the server to store the last time a s // 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.. */ diff --git a/settings.c b/settings.c index 90ffbe78c1..7a11a9515a 100644 --- a/settings.c +++ b/settings.c @@ -1092,7 +1092,7 @@ static const SettingDescGlobVarList _network_settings[] = { 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),