mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r23751) -Codechange: rename NetworkUDPGameLoop to a more descriptive name, and move the UDP specific bits to network_udp
This commit is contained in:
parent
b80fb93b1b
commit
531e501b5a
|
@ -827,20 +827,18 @@ static void NetworkSend()
|
|||
}
|
||||
}
|
||||
|
||||
/* We have to do some UDP checking */
|
||||
void NetworkUDPGameLoop()
|
||||
/**
|
||||
* We have to do some (simple) background stuff that runs normally,
|
||||
* even when we are not in multiplayer. For example stuff needed
|
||||
* for finding servers or downloading content.
|
||||
*/
|
||||
void NetworkBackgroundLoop()
|
||||
{
|
||||
_network_content_client.SendReceive();
|
||||
TCPConnecter::CheckCallbacks();
|
||||
NetworkHTTPSocketHandler::HTTPReceive();
|
||||
|
||||
if (_network_udp_server) {
|
||||
_udp_server_socket->ReceivePackets();
|
||||
_udp_master_socket->ReceivePackets();
|
||||
} else {
|
||||
_udp_client_socket->ReceivePackets();
|
||||
if (_network_udp_broadcast > 0) _network_udp_broadcast--;
|
||||
}
|
||||
NetworkBackgroundUDPLoop();
|
||||
}
|
||||
|
||||
/* The main loop called from ttd.c
|
||||
|
|
|
@ -40,7 +40,7 @@ const char *NetworkChangeCompanyPassword(CompanyID company_id, const char *passw
|
|||
void NetworkReboot();
|
||||
void NetworkDisconnect(bool blocking = false, bool close_admins = true);
|
||||
void NetworkGameLoop();
|
||||
void NetworkUDPGameLoop();
|
||||
void NetworkBackgroundLoop();
|
||||
void ParseConnectionString(const char **company, const char **port, char *connection_string);
|
||||
void NetworkStartDebugLog(NetworkAddress address);
|
||||
void NetworkPopulateCompanyStats(NetworkCompanyStats *stats);
|
||||
|
|
|
@ -675,4 +675,16 @@ void NetworkUDPClose()
|
|||
DEBUG(net, 1, "[udp] closed listeners");
|
||||
}
|
||||
|
||||
/** Receive the UDP packets. */
|
||||
void NetworkBackgroundUDPLoop()
|
||||
{
|
||||
if (_network_udp_server) {
|
||||
_udp_server_socket->ReceivePackets();
|
||||
_udp_master_socket->ReceivePackets();
|
||||
} else {
|
||||
_udp_client_socket->ReceivePackets();
|
||||
if (_network_udp_broadcast > 0) _network_udp_broadcast--;
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* ENABLE_NETWORK */
|
||||
|
|
|
@ -23,6 +23,7 @@ void NetworkUDPQueryServer(NetworkAddress address, bool manually = false);
|
|||
void NetworkUDPAdvertise();
|
||||
void NetworkUDPRemoveAdvertise(bool blocking);
|
||||
void NetworkUDPClose();
|
||||
void NetworkBackgroundUDPLoop();
|
||||
|
||||
#endif /* ENABLE_NETWORK */
|
||||
|
||||
|
|
|
@ -1348,7 +1348,7 @@ void GameLoop()
|
|||
if (_game_mode == GM_BOOTSTRAP) {
|
||||
#ifdef ENABLE_NETWORK
|
||||
/* Check for UDP stuff */
|
||||
if (_network_available) NetworkUDPGameLoop();
|
||||
if (_network_available) NetworkBackgroundLoop();
|
||||
#endif
|
||||
InputLoop();
|
||||
return;
|
||||
|
@ -1378,7 +1378,7 @@ void GameLoop()
|
|||
|
||||
#ifdef ENABLE_NETWORK
|
||||
/* Check for UDP stuff */
|
||||
if (_network_available) NetworkUDPGameLoop();
|
||||
if (_network_available) NetworkBackgroundLoop();
|
||||
|
||||
if (_networking && !HasModalProgress()) {
|
||||
/* Multiplayer */
|
||||
|
|
Loading…
Reference in New Issue