dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r3775) Fix loading of server_port from config file, introduced in Darkvater's unified configuration changes (r3719+)

Browse Source
This commit is contained in:
peter1138
2006-03-06 19:23:26 +00:00
parent 554f659e30
commit fc1e9c5a92
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
network.h
View File

@@ -159,7 +159,7 @@ VARDEF uint32 _last_sync_frame; // Used in the server to store the last time a s
// networking settings // networking settings
VARDEF uint32 _network_ip_list[MAX_INTERFACES + 1]; // Network IPs 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 /* 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 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.. */ in the openttd.cfg, but we wants to use the uint32 internally.. */

2
settings.c
View File

@@ -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_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_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_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("server_advertise", S, 0, _network_advertise, false, STR_NULL, NULL),
SDTG_BOOL("lan_internet", S, 0, _network_lan_internet, 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), SDTG_STR("player_name", SLE_STRB, S, 0, _network_player_name, NULL, STR_NULL, NULL),