(svn r14715) -Codechange: move some network code from the main gui file into one of the the network files.

2 files changed, 19 insertions, 0 deletions

diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index d1ff4e078..1ef35508b 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -956,4 +956,22 @@ void NetworkClientSetPassword(const char *password)
 	SEND_COMMAND(PACKET_CLIENT_SET_PASSWORD)(password);
 }
 
+/**
+ * Tell whether the client has team members where he/she can chat to.
+ * @param cio client to check members of.
+ * @return true if there is at least one team member.
+ */
+bool NetworkClientPreferTeamChat(const NetworkClientInfo *cio)
+{
+	/* Only companies actually playing can speak to team. Eg spectators cannot */
+	if (!_settings_client.gui.prefer_teamchat || !IsValidCompanyID(cio->client_playas)) return false;
+
+	const NetworkClientInfo *ci;
+	FOR_ALL_ACTIVE_CLIENT_INFOS(ci) {
+		if (ci->client_playas == cio->client_playas && ci != cio) return true;
+	}
+
+	return false;
+}
+
 #endif /* ENABLE_NETWORK */
diff --git a/src/network/network_func.h b/src/network/network_func.h
index c4c0cd6be..9d45035b7 100644
--- a/src/network/network_func.h
+++ b/src/network/network_func.h
@@ -41,6 +41,7 @@ bool NetworkClientConnectGame(const char *host, uint16 port);
 void NetworkClientSendRcon(const char *password, const char *command);
 void NetworkClientSendChat(NetworkAction action, DestType type, int dest, const char *msg);
 void NetworkClientSetPassword(const char *password);
+bool NetworkClientPreferTeamChat(const NetworkClientInfo *cio);
 
 /*** Commands ran by the server ***/
 void NetworkServerMonthlyLoop();