(svn r14710) -Change: simplify sending company information from the server to the client.

2 files changed, 11 insertions, 33 deletions

diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index 3c6f4dff1..5098a8f64 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -352,21 +352,13 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_BANNED)
 
 DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_COMPANY_INFO)
 {
-	byte company_info_version;
-	int i;
-
-	company_info_version = p->Recv_uint8();
+	byte company_info_version = p->Recv_uint8();
 
 	if (!MY_CLIENT->has_quit && company_info_version == NETWORK_COMPANY_INFO_VERSION) {
-		byte total;
-		CompanyID current;
-
-		total = p->Recv_uint8();
-
-		// There is no data at all..
-		if (total == 0) return NETWORK_RECV_STATUS_CLOSE_QUERY;
+		/* We have received all data... (there are no more packets coming) */
+		if (!p->Recv_bool()) return NETWORK_RECV_STATUS_CLOSE_QUERY;
 
-		current = (Owner)p->Recv_uint8();
+		CompanyID current = (Owner)p->Recv_uint8();
 		if (current >= MAX_COMPANIES) return NETWORK_RECV_STATUS_CLOSE_QUERY;
 
 		p->Recv_string(_network_company_info[current].company_name, sizeof(_network_company_info[current].company_name));
@@ -376,9 +368,9 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_COMPANY_INFO)
 		_network_company_info[current].income           = p->Recv_uint64();
 		_network_company_info[current].performance      = p->Recv_uint16();
 		_network_company_info[current].use_password     = p->Recv_bool();
-		for (i = 0; i < NETWORK_VEHICLE_TYPES; i++)
+		for (int i = 0; i < NETWORK_VEHICLE_TYPES; i++)
 			_network_company_info[current].num_vehicle[i] = p->Recv_uint16();
-		for (i = 0; i < NETWORK_STATION_TYPES; i++)
+		for (int i = 0; i < NETWORK_STATION_TYPES; i++)
 			_network_company_info[current].num_station[i] = p->Recv_uint16();
 
 		p->Recv_string(_network_company_info[current].clients, sizeof(_network_company_info[current].clients));
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index 0a4f35b4a..b4c8ef9d5 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -63,36 +63,22 @@ DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_CLIENT_INFO)(NetworkTCPSocketHandler
 
 DEF_SERVER_SEND_COMMAND(PACKET_SERVER_COMPANY_INFO)
 {
-//
+	//
 	// Packet: SERVER_COMPANY_INFO
 	// Function: Sends info about the companies
 	// Data:
 	//
 
-	int i;
-
 	Company *company;
 	Packet *p;
 
-	byte active = ActiveCompanyCount();
-
-	if (active == 0) {
-		p = NetworkSend_Init(PACKET_SERVER_COMPANY_INFO);
-
-		p->Send_uint8 (NETWORK_COMPANY_INFO_VERSION);
-		p->Send_uint8 (active);
-
-		cs->Send_Packet(p);
-		return;
-	}
-
 	NetworkPopulateCompanyInfo();
 
 	FOR_ALL_COMPANIES(company) {
 		p = NetworkSend_Init(PACKET_SERVER_COMPANY_INFO);
 
 		p->Send_uint8 (NETWORK_COMPANY_INFO_VERSION);
-		p->Send_uint8 (active);
+		p->Send_bool  (true);
 		p->Send_uint8 (company->index);
 
 		p->Send_string(_network_company_info[company->index].company_name);
@@ -105,11 +91,11 @@ DEF_SERVER_SEND_COMMAND(PACKET_SERVER_COMPANY_INFO)
 		/* Send 1 if there is a passord for the company else send 0 */
 		p->Send_bool(!StrEmpty(_network_company_info[company->index].password));
 
-		for (i = 0; i < NETWORK_VEHICLE_TYPES; i++) {
+		for (int i = 0; i < NETWORK_VEHICLE_TYPES; i++) {
 			p->Send_uint16(_network_company_info[company->index].num_vehicle[i]);
 		}
 
-		for (i = 0; i < NETWORK_STATION_TYPES; i++) {
+		for (int i = 0; i < NETWORK_STATION_TYPES; i++) {
 			p->Send_uint16(_network_company_info[company->index].num_station[i]);
 		}
 
@@ -125,7 +111,7 @@ DEF_SERVER_SEND_COMMAND(PACKET_SERVER_COMPANY_INFO)
 	p = NetworkSend_Init(PACKET_SERVER_COMPANY_INFO);
 
 	p->Send_uint8 (NETWORK_COMPANY_INFO_VERSION);
-	p->Send_uint8 (0);
+	p->Send_bool  (false);
 
 	cs->Send_Packet(p);
 }