diff options
| author | Rubidium <rubidium@openttd.org> | 2021-04-11 11:22:50 +0200 |
|---|---|---|
| committer | Patric Stout <github@truebrain.nl> | 2021-04-12 21:10:21 +0200 |
| commit | ca6b9ad8b0a64ebc812cf2e748d8ea9c874b4860 (patch) | |
| tree | 56c3e654a65d0b0e8b0b6b7bbbe4de960aebf8ef /src/network/network.cpp | |
| parent | c4bccd4f70cc369d5b3867f8dac74b0ac1d9ea5c (diff) | |
| download | openttd-ca6b9ad8b0a64ebc812cf2e748d8ea9c874b4860.tar.xz | |
Change: move some things only relevant to UDP from network.cpp to network_udp.cpp
Diffstat (limited to 'src/network/network.cpp')
| -rw-r--r-- | src/network/network.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/network/network.cpp b/src/network/network.cpp index 1d5563c3d..f4640191c 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -74,19 +74,12 @@ uint32 _sync_seed_2; ///< Second part of the seed. #endif uint32 _sync_frame; ///< The frame to perform the sync check. bool _network_first_time; ///< Whether we have finished joining or not. -bool _network_udp_server; ///< Is the UDP server started? -uint16 _network_udp_broadcast; ///< Timeout for the UDP broadcasts. -uint8 _network_advertise_retries; ///< The number of advertisement retries we did. CompanyMask _network_company_passworded; ///< Bitmask of the password status of all companies. /* Check whether NETWORK_NUM_LANDSCAPES is still in sync with NUM_LANDSCAPE */ static_assert((int)NETWORK_NUM_LANDSCAPES == (int)NUM_LANDSCAPE); static_assert((int)NETWORK_COMPANY_NAME_LENGTH == MAX_LENGTH_COMPANY_NAME_CHARS * MAX_CHAR_LENGTH); -extern NetworkUDPSocketHandler *_udp_client_socket; ///< udp client socket -extern NetworkUDPSocketHandler *_udp_server_socket; ///< udp server socket -extern NetworkUDPSocketHandler *_udp_master_socket; ///< udp master socket - /** The amount of clients connected */ byte _network_clients_connected = 0; @@ -724,7 +717,7 @@ bool NetworkServerStart() /* Try to start UDP-server */ DEBUG(net, 1, "starting listeners for incoming server queries"); - _network_udp_server = _udp_server_socket->Listen(); + NetworkUDPServerListen(); _network_company_states = CallocT<NetworkCompanyState>(MAX_COMPANIES); _network_server = true; @@ -1060,7 +1053,6 @@ void NetworkStartUp() _network_available = NetworkCoreInitialize(); _network_dedicated = false; _network_need_advertise = true; - _network_advertise_retries = 0; /* Generate an server id when there is none yet */ if (StrEmpty(_settings_client.network.network_id)) NetworkGenerateServerId(); |