cpp/openttd-patchpack/source Changeset - r2944:25bed4e89f1d

Changeset - r2944:25bed4e89f1d

Parent rev.

Child rev.

[Not reviewed]

master

0 8 0

Darkvater - 18 years ago 2006-01-31 22:16:15
darkvater@openttd.org

(svn r3500) - Workaround the inaccurate count of spectators/companies that can happen in certain border-cases. For now just dynamically get this value when requested so it is always right. To do properly all player/client creation/destruction needs a hook for networking.

8 files changed with 40 insertions and 40 deletions:

console_cmds.c

network.c

network.h

network_server.c

network_udp.c

openttd.c

player.h

players.c

0 comments (0 inline, 0 general)

console_cmds.c

➞

Show inline comments

@@ @@ -542,14 +542,14 @@ DEF_CONSOLE_CMD(ConServerInfo) @@
 		IConsoleHelp("You can change these values by setting the variables 'max_clients', 'max_companies' and 'max_spectators'");
 		return true;
+	}
 	gi = &_network_game_info;
 	IConsolePrintF(_icolour_def, "Current/maximum clients:    %2d/%2d", gi->clients_on, gi->clients_max);
 	IConsolePrintF(_icolour_def, "Current/maximum companies:  %2d/%2d", gi->companies_on, gi->companies_max);
 	IConsolePrintF(_icolour_def, "Current/maximum spectators: %2d/%2d", gi->spectators_on, gi->spectators_max);
 	IConsolePrintF(_icolour_def, "Current/maximum companies:  %2d/%2d", ActivePlayerCount(), gi->companies_max);
 	IConsolePrintF(_icolour_def, "Current/maximum spectators: %2d/%2d", NetworkSpectatorCount(), gi->spectators_max);
 	return true;
+}
 DEF_CONSOLE_HOOK(ConHookValidateMaxClientsCount) {
 	/* XXX - hardcoded, string limiation -- TrueLight

network.c

➞

Show inline comments

@@ @@ -100,12 +100,24 @@ void NetworkGetClientName(char *client_n @@
 	if (ci->client_name[0] == '\0')
 		snprintf(client_name, size, "Client #%d", cs->index);
 	else
 		snprintf(client_name, size, "%s", ci->client_name);
+}
 byte NetworkSpectatorCount(void)
+{
 	const NetworkClientState *cs;
 	byte count = 0;
 	FOR_ALL_CLIENTS(cs) {
 		if (DEREF_CLIENT_INFO(cs)->client_playas == OWNER_SPECTATOR) count++;
+	}
 	return count;
+}
 // This puts a text-message to the console, or in the future, the chat-box,
 //  (to keep it all a bit more general)
 // If 'self_send' is true, this is the client who is sending the message
 void CDECL NetworkTextMessage(NetworkAction action, uint16 color, bool self_send, const char *name, const char *str, ...)
+{
 	char buf[1024];
@@ @@ -551,17 +563,13 @@ void NetworkCloseClient(NetworkClientSta @@
 	// Close the gap in the client-list
 	ci = DEREF_CLIENT_INFO(cs);
 	if (_network_server) {
 		// We just lost one client :(
 		if (cs->status > STATUS_INACTIVE) {
 			_network_game_info.clients_on--;
 			if (DEREF_CLIENT_INFO(cs)->client_playas == OWNER_SPECTATOR)
 				_network_game_info.spectators_on--;
+		}
 		if (cs->status > STATUS_INACTIVE) _network_game_info.clients_on--;
 		_network_clients_connected--;
 		while ((cs + 1) != DEREF_CLIENT(MAX_CLIENTS) && (cs + 1)->socket != INVALID_SOCKET) {
 			*cs = *(cs + 1);
 			*ci = *(ci + 1);
 			cs++;

network.h

➞

Show inline comments

@@ @@ -70,15 +70,15 @@ typedef struct NetworkGameInfo { @@
 	byte server_lang;                               // Language of the server (we should make a nice table for this)
 	byte use_password;                              // Is set to != 0 if it uses a password
 	char server_password[NETWORK_PASSWORD_LENGTH];  // On the server: the game password, on the client: != "" if server has password
 	byte clients_max;                               // Max clients allowed on server
 	byte clients_on;                                // Current count of clients on server
 	byte companies_max;                             // Max companies allowed on server
 	byte companies_on;                              // How many started companies do we have
+	byte companies_on;                              // How many started companies do we have (XXX - disabled for server atm, use ActivePlayerCount())
 	byte spectators_max;                            // Max spectators allowed on server
 	byte spectators_on;                             // How many spectators do we have?
+	byte spectators_on;                             // How many spectators do we have? (XXX - disabled for server atm, use NetworkSpectatorCount())
 	uint16 game_date;                               // Current date
 	uint16 start_date;                              // When the game started
 	char map_name[NETWORK_NAME_LENGTH];             // Map which is played ["random" for a randomized map]
 	uint16 map_width;                               // Map width
 	uint16 map_height;                              // Map height
 	byte map_set;                                   // Graphical set
@@ @@ -207,12 +207,14 @@ VARDEF uint8 _network_autoclean_unprotec @@
 VARDEF uint8 _network_autoclean_protected;   // Unprotect a company after X months
 VARDEF uint16 _network_restart_game_date;    // If this year is reached, the server automaticly restarts
 NetworkGameList *NetworkQueryServer(const char* host, unsigned short port, bool game_info);
 byte NetworkSpectatorCount(void);
 #endif /* ENABLE_NETWORK */
 // Those variables must always be registered!
 #define MAX_SAVED_SERVERS 10
 VARDEF char *_network_host_list[MAX_SAVED_SERVERS];
 #define MAX_BANS 25

network_server.c

➞

Show inline comments

@@ @@ -71,18 +71,13 @@ DEF_SERVER_SEND_COMMAND(PACKET_SERVER_CO @@
 	int i;
 	Player *player;
 	Packet *p;
 	byte active = 0;
 	FOR_ALL_PLAYERS(player) {
 		if (player->is_active)
 			active++;
+	}
 	byte active = ActivePlayerCount();
 	if (active == 0) {
 		Packet *p = NetworkSend_Init(PACKET_SERVER_COMPANY_INFO);
 		NetworkSend_uint8 (p, NETWORK_COMPANY_INFO_VERSION);
 		NetworkSend_uint8 (p, active);
@@ @@ -211,21 +206,18 @@ DEF_SERVER_SEND_COMMAND(PACKET_SERVER_WE @@
 	// Data:
 	//    uint16:  Own ClientID
 	//
 	Packet *p;
 	const NetworkClientState *new_cs;
 	const NetworkClientInfo *ci = DEREF_CLIENT_INFO(cs);
 	// Invalid packet when status is AUTH or higher
 	if (cs->status >= STATUS_AUTH) return;
 	cs->status = STATUS_AUTH;
 	_network_game_info.clients_on++;
 	/* increment spectator; defer company addition for when player is actually created */
 	if (ci->client_playas == OWNER_SPECTATOR) _network_game_info.spectators_on++;
 	p = NetworkSend_Init(PACKET_SERVER_WELCOME);
 	NetworkSend_uint16(p, cs->index);
 	NetworkSend_Packet(p, cs);
 		// Transmit info about all the active clients
@@ @@ -612,19 +604,19 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT @@
 	if (cs->quited) return;
 	// join another company does not affect these values
 	switch (playas) {
 		case 0: /* New company */
-			if (_network_game_info.companies_on >= _network_game_info.companies_max) {
+			if (ActivePlayerCount() >= _network_game_info.companies_max) {
 				SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_FULL);
 				return;
+			}
 			break;
 		case OWNER_SPECTATOR: /* Spectator */
-			if (_network_game_info.spectators_on >= _network_game_info.spectators_max) {
+			if (NetworkSpectatorCount() >= _network_game_info.spectators_max) {
 				SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_FULL);
 				return;
+			}
 			break;
+	}

network_udp.c

➞

Show inline comments

@@ @@ -61,23 +61,23 @@ DEF_UDP_RECEIVE_COMMAND(PACKET_UDP_CLIEN @@
 	_network_game_info.map_set = _opt.landscape;
 	NetworkSend_uint8 (packet, NETWORK_GAME_INFO_VERSION);
 	/* 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 */
 	NetworkSend_string(packet, _network_game_info.server_name);
 	NetworkSend_string(packet, _network_game_info.server_revision);
 	NetworkSend_uint8 (packet, _network_game_info.server_lang);
 	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);
 	NetworkSend_uint16(packet, _network_game_info.map_width);
 	NetworkSend_uint16(packet, _network_game_info.map_height);
 	NetworkSend_uint8 (packet, _network_game_info.map_set);
@@ @@ -159,30 +159,24 @@ DEF_UDP_RECEIVE_COMMAND(PACKET_UDP_SERVE @@
 DEF_UDP_RECEIVE_COMMAND(PACKET_UDP_CLIENT_DETAIL_INFO)
+{
 	NetworkClientState *cs;
 	NetworkClientInfo *ci;
 	Packet *packet;
 	Player *player;
 	byte active = 0;
 	byte current = 0;
 	int i;
 	// Just a fail-safe.. should never happen
 	if (!_network_udp_server)
 		return;
 	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();
 	/* Go through all the players */
 	FOR_ALL_PLAYERS(player) {

openttd.c

➞

Show inline comments

@@ @@ -759,19 +759,14 @@ void SwitchMode(int new_mode) @@
 			LoadIntroGame();
 			ShowErrorMessage(INVALID_STRING_ID, STR_4009_GAME_LOAD_FAILED, 0, 0);
 		} else {
 			_local_player = 0;
 			DoCommandP(0, 0, 0, NULL, CMD_PAUSE); // decrease pause counter (was increased from opening load dialog)
 #ifdef ENABLE_NETWORK
 			if (_network_server) {
 				/* If we have loaded a game we need to correctly update the company-count */
 				const Player *p;
 				_network_game_info.companies_on = 0;
 				FOR_ALL_PLAYERS(p) {if (p->is_active) _network_game_info.companies_on++;}
 			if (_network_server)
 				snprintf(_network_game_info.map_name, NETWORK_NAME_LENGTH, "%s (Loaded game)", _file_to_saveload.title);
+			}
 #endif /* ENABLE_NETWORK */
+		}
 		break;
+	}
 	case SM_LOAD_SCENARIO: { /* Load scenario from scenario editor */

player.h

➞

Show inline comments

@@ @@ -208,12 +208,14 @@ VARDEF PlayerID _current_player; @@
 #define MAX_PLAYERS 8
 VARDEF Player _players[MAX_PLAYERS];
 // NOSAVE: can be determined from player structs
 VARDEF byte _player_colors[MAX_PLAYERS];
 byte ActivePlayerCount(void);
 static inline Player* GetPlayer(PlayerID i)
+{
 	assert(i < lengthof(_players));
 	return &_players[i];
+}

players.c

➞

Show inline comments

@@ @@ -177,12 +177,24 @@ void DrawPlayerFace(uint32 face, int col @@
 		} else {
 			if (val <= 1) DrawSprite(0x347 + val, x, y);
+		}
+	}
+}
 byte ActivePlayerCount(void)
+{
 	const Player *p;
 	byte count = 0;
 	FOR_ALL_PLAYERS(p) {
 		if (p->is_active) count++;
+	}
 	return count;
+}
 void InvalidatePlayerWindows(const Player *p)
+{
 	PlayerID pid = p->index;
 	if (pid == _local_player) InvalidateWindow(WC_STATUS_BAR, 0);
 	InvalidateWindow(WC_FINANCES, pid);
@@ @@ -854,21 +866,19 @@ int32 CmdPlayerCtrl(int x, int y, uint32 @@
 					 * with joining to let it send itself the command, and not the server?
 					 * For example in network_client.c:534? */
 					_cmd_text = ci->client_name;
 					_local_player = ci->client_playas - 1;
 					NetworkSend_Command(0, 0, 0, CMD_CHANGE_PRESIDENT_NAME, NULL);
 					_local_player = player_backup;
 					_network_game_info.companies_on++;
+				}
+			}
 		} else if (_network_server) { // Creating player failed, defer client to spectator
 				/* XXX - UGLY! p2 (pid) is mis-used to fetch the client-id, done at server-side
 				* in network_server.c:838, function DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMMAND) */
 			NetworkClientInfo *ci = &_network_client_info[pid];
 			ci->client_playas = OWNER_SPECTATOR;
 			_network_game_info.spectators_on++;
 			NetworkUpdateClientInfo(ci->client_index);
+		}
 #else
+		}
 #endif /* ENABLE_NETWORK */
 	} break;
@@ @@ -901,15 +911,12 @@ int32 CmdPlayerCtrl(int x, int y, uint32 @@
 			/* Remove the company */
 			ChangeOwnershipOfPlayerItems(p->index, OWNER_SPECTATOR);
 			p->money64 = p->player_money = 100000000; // XXX - wtf?
 			p->is_active = false;
+		}
 		RemoveAllEngineReplacementForPlayer(p);
 #ifdef ENABLE_NETWORK
 		_network_game_info.companies_on--;
 #endif /* ENABLE_NETWORK */
 	} break;
 	case 3: { /* Merge a company (#1) into another company (#2), elimination company #1 */
 		PlayerID pid_old = GB(p2,  0, 16);
 		PlayerID pid_new = GB(p2, 16, 16);

0 comments (0 inline, 0 general)