cpp/openttd-patchpack/source Changeset - r18892:ba984148392c

Changeset - r18892:ba984148392c

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

rubidium - 13 years ago 2012-01-04 22:08:43
rubidium@openttd.org

(svn r23751) -Codechange: rename NetworkUDPGameLoop to a more descriptive name, and move the UDP specific bits to network_udp

5 files changed with 23 insertions and 12 deletions:

src/network/network.cpp

src/network/network_func.h

src/network/network_udp.cpp

src/network/network_udp.h

src/openttd.cpp

0 comments (0 inline, 0 general)

src/network/network.cpp

➞

Show inline comments

@@ @@ -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

src/network/network_func.h

➞

Show inline comments

@@ @@ -40,7 +40,7 @@ const char *NetworkChangeCompanyPassword @@
 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);

src/network/network_udp.cpp

➞

Show inline comments

@@ @@ -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 */

src/network/network_udp.h

➞

Show inline comments

@@ @@ -23,6 +23,7 @@ void NetworkUDPQueryServer(NetworkAddres @@
 void NetworkUDPAdvertise();
 void NetworkUDPRemoveAdvertise(bool blocking);
 void NetworkUDPClose();
 void NetworkBackgroundUDPLoop();
 #endif /* ENABLE_NETWORK */

src/openttd.cpp

➞

Show inline comments

@@ @@ -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 */

0 comments (0 inline, 0 general)