miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge 1.5.3-RC1

Browse Source
This commit is contained in:
Pavel Stupnikov
2015-11-01 21:17:36 +03:00
parent ee92c125c8 c06a5008b2
commit 43340b1676
62 changed files with 767 additions and 1268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/network.cpp
View File

@@ -1,4 +1,4 @@
/* $Id: network.cpp 26788 2014-09-07 14:21:16Z frosch $ */
/* $Id: network.cpp 27431 2015-11-01 11:59:17Z frosch $ */
/*
* This file is part of OpenTTD.
@@ -63,7 +63,6 @@ NetworkCompanyState *_network_company_states = NULL; ///< Statistics about some
ClientID _network_own_client_id; ///< Our client identifier.
ClientID _redirect_console_to_client; ///< If not invalid, redirect the console output to a client.
bool _network_need_advertise; ///< Whether we need to advertise.
uint32 _network_last_advertise_frame; ///< Last time we did advertise.
uint8 _network_reconnect; ///< Reconnect timeout
StringList _network_bind_list; ///< The addresses to bind on.
StringList _network_host_list; ///< The servers we know.
@@ -760,7 +759,6 @@ bool NetworkServerStart()
if (_network_dedicated) IConsoleCmdExec("exec scripts/on_dedicated.scr 0");
/* Try to register us to the master server */
_network_last_advertise_frame = 0;
_network_need_advertise = true;
NetworkUDPAdvertise();
@@ -1077,7 +1075,6 @@ void NetworkStartUp()
/* Network is available */
_network_available = NetworkCoreInitialize();
_network_dedicated = false;
_network_last_advertise_frame = 0;
_network_need_advertise = true;
_network_advertise_retries = 0;