cpp/openttd-patchpack/source Changeset - r9429:9bb0dfa4c67f

Changeset - r9429:9bb0dfa4c67f

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 16 years ago 2008-05-30 20:08:32
rubidium@openttd.org

(svn r13344) -Codechange: remove some code duplication.

2 files changed with 12 insertions and 25 deletions:

src/network/network.cpp

src/openttd.cpp

0 comments (0 inline, 0 general)

src/network/network.cpp

➞

Show inline comments

@@ @@ -877,12 +877,22 @@ static void NetworkClose() @@
+	}
 	if (_network_server) {
-		// We are a server, also close the listensocket
+		/* We are a server, also close the listensocket */
 		closesocket(_listensocket);
 		_listensocket = INVALID_SOCKET;
 		DEBUG(net, 1, "Closed listener");
 		NetworkUDPCloseAll();
+	}
 	NetworkUDPCloseAll();
 	/* Free all queued commands */
 	while (_local_command_queue != NULL) {
 		CommandPacket *p = _local_command_queue;
 		_local_command_queue = _local_command_queue->next;
 		free(p);
+	}
 	_networking = false;
 	_network_server = false;
+}
 // Inits the network (cleans sockets and stuff)
@@ @@ -988,7 +998,6 @@ bool NetworkClientConnectGame(const char @@
 	_settings_client.network.last_port = port;
 	NetworkDisconnect();
 	NetworkUDPCloseAll();
 	NetworkInitialize();
 	// Try to connect
@@ @@ -1114,16 +1123,6 @@ void NetworkReboot() @@
+	}
 	NetworkClose();
 	// Free all queued commands
 	while (_local_command_queue != NULL) {
 		CommandPacket *p = _local_command_queue;
 		_local_command_queue = _local_command_queue->next;
 		free(p);
+	}
 	_networking = false;
 	_network_server = false;
+}
 // We want to disconnect from the host/clients
@@ @@ -1142,16 +1141,6 @@ void NetworkDisconnect() @@
 	DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
 	NetworkClose();
 	// Free all queued commands
 	while (_local_command_queue != NULL) {
 		CommandPacket *p = _local_command_queue;
 		_local_command_queue = _local_command_queue->next;
 		free(p);
+	}
 	_networking = false;
 	_network_server = false;
+}
 // Receives something from the network

src/openttd.cpp

➞

Show inline comments

@@ @@ -810,10 +810,8 @@ void SwitchMode(int new_mode) @@
 		if (_networking) {
 			if (_network_server && (new_mode == SM_LOAD || new_mode == SM_NEWGAME)) {
 				NetworkReboot();
 				NetworkUDPCloseAll();
 			} else {
 				NetworkDisconnect();
 				NetworkUDPCloseAll();
+			}
+		}

0 comments (0 inline, 0 general)