network_udp.c
changeset 2944 7c392e7b51c6
parent 2881 1ffbbdbf1685
child 3456 133bad819a94
--- a/network_udp.c	Tue Jan 31 20:05:44 2006 +0000
+++ b/network_udp.c	Tue Jan 31 22:16:15 2006 +0000
@@ -64,7 +64,7 @@
 
 	/* NETWORK_GAME_INFO_VERSION = 2 */
 	NetworkSend_uint8 (packet, _network_game_info.companies_max);
-	NetworkSend_uint8 (packet, _network_game_info.companies_on);
+	NetworkSend_uint8 (packet, ActivePlayerCount());
 	NetworkSend_uint8 (packet, _network_game_info.spectators_max);
 
 	/* NETWORK_GAME_INFO_VERSION = 1 */
@@ -74,7 +74,7 @@
 	NetworkSend_uint8 (packet, _network_game_info.use_password);
 	NetworkSend_uint8 (packet, _network_game_info.clients_max);
 	NetworkSend_uint8 (packet, _network_game_info.clients_on);
-	NetworkSend_uint8 (packet, _network_game_info.spectators_on);
+	NetworkSend_uint8 (packet, NetworkSpectatorCount());
 	NetworkSend_uint16(packet, _network_game_info.game_date);
 	NetworkSend_uint16(packet, _network_game_info.start_date);
 	NetworkSend_string(packet, _network_game_info.map_name);
@@ -162,7 +162,6 @@
 	NetworkClientInfo *ci;
 	Packet *packet;
 	Player *player;
-	byte active = 0;
 	byte current = 0;
 	int i;
 
@@ -172,14 +171,9 @@
 
 	packet = NetworkSend_Init(PACKET_UDP_SERVER_DETAIL_INFO);
 
-	FOR_ALL_PLAYERS(player) {
-		if (player->is_active)
-			active++;
-	}
-
 	/* Send the amount of active companies */
 	NetworkSend_uint8 (packet, NETWORK_COMPANY_INFO_VERSION);
-	NetworkSend_uint8 (packet, active);
+	NetworkSend_uint8 (packet, ActivePlayerCount());
 
 	/* Fetch the latest version of everything */
 	NetworkPopulateCompanyInfo();