cpp/openttd-patchpack/source Changeset - r717:02ff19796b81

Changeset - r717:02ff19796b81

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

truelight - 20 years ago 2004-12-19 10:24:45
truelight@openttd.org

(svn r1169) -Fix: [Network] [ 1087591 ] When you want to be a spectator, you now
stay a spectator even if someone else joins.

2 files changed with 5 insertions and 8 deletions:

network_client.c

players.c

0 comments (0 inline, 0 general)

network_client.c

➞

Show inline comments

@@ @@ -415,198 +415,192 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER @@
 	InvalidateWindow(WC_NETWORK_STATUS_WINDOW, 0);
 	// We are put on hold for receiving the map.. we need GUI for this ;)
 	DEBUG(net, 1)("[NET] The server is currently busy sending the map to someone else.. please hold..." );
 	DEBUG(net, 1)("[NET]  There are %d clients in front of you", _network_join_waiting);
 	return NETWORK_RECV_STATUS_OKAY;
+}
 DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_MAP)
+{
 	static char filename[256];
 	static FILE *file_pointer;
 	byte maptype;
 	maptype = NetworkRecv_uint8(p);
 	// First packet, init some stuff
 	if (maptype == MAP_PACKET_START) {
 		// The name for the temp-map
 		sprintf(filename, "%s%snetwork_client.tmp",  _path.autosave_dir, PATHSEP);
 		file_pointer = fopen(filename, "wb");
 		if (file_pointer == NULL) {
 			_switch_mode_errorstr = STR_NETWORK_ERR_SAVEGAMEERROR;
 			return NETWORK_RECV_STATUS_SAVEGAME;
+		}
 		_frame_counter = _frame_counter_server = _frame_counter_max = NetworkRecv_uint32(p);
 		_network_join_status = NETWORK_JOIN_STATUS_DOWNLOADING;
 		_network_join_kbytes = 0;
 		_network_join_kbytes_total = NetworkRecv_uint32(p) / 1024;
 		InvalidateWindow(WC_NETWORK_STATUS_WINDOW, 0);
 		// The first packet does not contain any more data
 		return NETWORK_RECV_STATUS_OKAY;
+	}
 	if (maptype == MAP_PACKET_NORMAL) {
 		// We are still receiving data, put it to the file
 		fwrite(p->buffer + p->pos, 1, p->size - p->pos, file_pointer);
 		_network_join_kbytes = ftell(file_pointer) / 1024;
 		InvalidateWindow(WC_NETWORK_STATUS_WINDOW, 0);
+	}
 	if (maptype == MAP_PACKET_PATCH) {
 		NetworkRecvPatchSettings(p);
+	}
 	// Check if this was the last packet
 	if (maptype == MAP_PACKET_END) {
 		// We also get, very nice, the player_seeds in this packet
 		int i;
 		for (i = 0; i < MAX_PLAYERS; i++) {
 			_player_seeds[i][0] = NetworkRecv_uint32(p);
 			_player_seeds[i][1] = NetworkRecv_uint32(p);
+		}
 		fclose(file_pointer);
 		_network_join_status = NETWORK_JOIN_STATUS_PROCESSING;
 		InvalidateWindow(WC_NETWORK_STATUS_WINDOW, 0);
 		// The map is done downloading, load it
 		// Load the map
 		if (!SafeSaveOrLoad(filename, SL_LOAD, GM_NORMAL)) {
 			DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
 			_switch_mode_errorstr = STR_NETWORK_ERR_SAVEGAMEERROR;
 			return NETWORK_RECV_STATUS_SAVEGAME;
+		}
 		_opt_mod_ptr = &_opt;
 		// Say we received the map and loaded it correctly!
 		SEND_COMMAND(PACKET_CLIENT_MAP_OK)();
 		if (_network_playas == 0 || _network_playas > MAX_PLAYERS ||
 				!DEREF_PLAYER(_network_playas - 1)->is_active) {
 			if (_network_playas == OWNER_SPECTATOR) {
 				// The client wants to be a spectator..
 				_local_player = OWNER_SPECTATOR;
 				DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
 			} else {
 				// send a command to make a new player
 				_local_player = 0;
 				NetworkSend_Command(0, 0, 0, CMD_PLAYER_CTRL, NULL);
 				_local_player = OWNER_SPECTATOR;
+			}
 		} else {
 			// take control over an existing company
 			_local_player = _network_playas - 1;
 			DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
+		}
 		// Remeber the player
 		if (_local_player != OWNER_SPECTATOR)
 			_network_playas = _local_player + 1;
 		else
 			_network_playas = OWNER_SPECTATOR;
+	}
 	return NETWORK_RECV_STATUS_OKAY;
+}
 DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_FRAME)
+{
 	_frame_counter_server = NetworkRecv_uint32(p);
 	_frame_counter_max = NetworkRecv_uint32(p);
 #ifdef ENABLE_NETWORK_SYNC_EVERY_FRAME
 	// Test if the server supports this option
 	//  and if we are at the frame the server is
 	if (p->pos < p->size) {
 		_sync_frame = _frame_counter_server;
 		_sync_seed_1 = NetworkRecv_uint32(p);
 #ifdef NETWORK_SEND_DOUBLE_SEED
 		_sync_seed_2 = NetworkRecv_uint32(p);
 #endif
+	}
 #endif
 	DEBUG(net, 7)("[NET] Received FRAME %d",_frame_counter_server);
 	// Let the server know that we received this frame correctly
 	//  We do this only once per day, to save some bandwidth ;)
 	if (!_network_first_time && last_ack_frame < _frame_counter) {
 		last_ack_frame = _frame_counter + DAY_TICKS;
 		DEBUG(net,6)("[NET] Sent ACK at %d", _frame_counter);
 		SEND_COMMAND(PACKET_CLIENT_ACK)();
+	}
 	return NETWORK_RECV_STATUS_OKAY;
+}
 DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_SYNC)
+{
 	_sync_frame = NetworkRecv_uint32(p);
 	_sync_seed_1 = NetworkRecv_uint32(p);
 #ifdef NETWORK_SEND_DOUBLE_SEED
 	_sync_seed_2 = NetworkRecv_uint32(p);
 #endif
 	return NETWORK_RECV_STATUS_OKAY;
+}
 DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_COMMAND)
+{
 	int i;
 	char *dparam_char;
 	CommandPacket *cp = malloc(sizeof(CommandPacket));
 	cp->player = NetworkRecv_uint8(p);
 	cp->cmd = NetworkRecv_uint32(p);
 	cp->p1 = NetworkRecv_uint32(p);
 	cp->p2 = NetworkRecv_uint32(p);
 	cp->tile = NetworkRecv_uint32(p);
 	/* We are going to send them byte by byte, because dparam is misused
 	    for chars (if it is used), and else we have a BigEndian / LittleEndian
 	    problem.. we should fix the misuse of dparam... -- TrueLight */
 	dparam_char = (char *)&cp->dp[0];
 	for (i = 0; i < lengthof(cp->dp) * 4; i++) {
 		*dparam_char = NetworkRecv_uint8(p);
 		dparam_char++;
+	}
 	cp->callback = NetworkRecv_uint8(p);
 	cp->frame = NetworkRecv_uint32(p);
 	cp->next = NULL;
 	// The server did send us this command..
 	//  queue it in our own queue, so we can handle it in the upcoming frame!
 	if (_local_command_queue == NULL) {
 		_local_command_queue = cp;
 	} else {
 		// Find last packet
 		CommandPacket *c = _local_command_queue;
 		while (c->next != NULL) c = c->next;
 		c->next = cp;
+	}
 	return NETWORK_RECV_STATUS_OKAY;
+}
 DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CHAT)
+{
 	NetworkAction action = NetworkRecv_uint8(p);
 	char msg[MAX_TEXT_MSG_LEN];
 	NetworkClientInfo *ci, *ci_to;
 	uint16 index;
 	char name[NETWORK_NAME_LENGTH];
 	index = NetworkRecv_uint16(p);
 	NetworkRecv_string(p, msg, MAX_TEXT_MSG_LEN);
 	ci_to = NetworkFindClientInfoFromIndex(index);
 	if (ci_to == NULL) return NETWORK_RECV_STATUS_OKAY;
 	if (action == NETWORK_ACTION_CHAT_TO_CLIENT) {

players.c

➞

Show inline comments

@@ @@ -560,194 +560,197 @@ void RunOtherPlayersLoop() @@
 			else
 				AiDoGameLoop(p);
+		}
+	}
 	_is_ai_player = false;
 	_current_player = OWNER_NONE;
+}
 // index is the next parameter in _decode_parameters to set up
 StringID GetPlayerNameString(byte player, byte index)
+{
 	if (IS_HUMAN_PLAYER(player) && player < MAX_PLAYERS) {
 		SetDParam(index, player+1);
 		return STR_7002_PLAYER;
+	}
 	return STR_EMPTY;
+}
 extern void ShowPlayerFinances(int player);
 void PlayersYearlyLoop()
+{
 	Player *p;
 	// Copy statistics
 	FOR_ALL_PLAYERS(p) {
 		if (p->is_active) {
 			memmove(&p->yearly_expenses[1], &p->yearly_expenses[0], sizeof(p->yearly_expenses) - sizeof(p->yearly_expenses[0]));
 			memset(&p->yearly_expenses[0], 0, sizeof(p->yearly_expenses[0]));
 			InvalidateWindow(WC_FINANCES, p->index);
+		}
+	}
 	if (_patches.show_finances && _local_player != OWNER_SPECTATOR) {
 		ShowPlayerFinances(_local_player);
 		p = DEREF_PLAYER(_local_player);
 		if (p->num_valid_stat_ent > 5 && p->old_economy[0].performance_history < p->old_economy[4].performance_history) {
 			SndPlayFx(SND_01_BAD_YEAR);
 		} else {
 			SndPlayFx(SND_00_GOOD_YEAR);
+		}
+	}
+}
 void DeletePlayerWindows(int pi)
+{
 	DeleteWindowById(WC_COMPANY, pi);
 	DeleteWindowById(WC_FINANCES, pi);
 	DeleteWindowById(WC_STATION_LIST, pi);
 	DeleteWindowById(WC_TRAINS_LIST, pi);
 	DeleteWindowById(WC_ROADVEH_LIST, pi);
 	DeleteWindowById(WC_SHIPS_LIST, pi);
 	DeleteWindowById(WC_AIRCRAFT_LIST, pi);
 	DeleteWindowById(WC_BUY_COMPANY, pi);
+}
 static void DeletePlayerStuff(int pi)
+{
 	Player *p;
 	DeletePlayerWindows(pi);
 	p = DEREF_PLAYER(pi);
 	DeleteName(p->name_1);
 	DeleteName(p->president_name_1);
 	p->name_1 = 0;
 	p->president_name_1 = 0;
+}
 // functionality.
 // 0 - make new player
 // 1 - make new AI player
 // 2 - delete player (p2)
 // 3 - join player (p1 >> 8) & 0xFF with (p1 >> 16) & 0xFF
 int32 CmdPlayerCtrl(int x, int y, uint32 flags, uint32 p1, uint32 p2)
+{
 	int pi;
 	Player *p;
 	if (!(flags & DC_EXEC))
 		return 0;
 	_current_player = OWNER_NONE;
 	switch(p1 & 0xff) {
 	case 0: // make new player
 		p = DoStartupNewPlayer(false);
 #ifdef ENABLE_NETWORK
 		if (_networking && !_network_server && _local_player == OWNER_SPECTATOR)
 			/* In case we are a client joining a server... */
 			DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
 #endif /* ENABLE_NETWORK */
 		if (p != NULL) {
 			if (_local_player == OWNER_SPECTATOR) {
 				_local_player = p->index;
 				MarkWholeScreenDirty();
 				/* Check if we do not want to be a spectator in network */
 				if (!_networking || _network_server || _network_playas != OWNER_SPECTATOR) {
 					_local_player = p->index;
 					MarkWholeScreenDirty();
+				}
+			}
 #ifdef ENABLE_NETWORK
 			if (_network_server) {
 				NetworkClientInfo *ci;
 				// UGLY! p2 is mis-used to fetch the client-id
 				ci = &_network_client_info[p2];
 				ci->client_playas = p->index + 1;
 				NetworkUpdateClientInfo(ci->client_index);
 				if (ci->client_playas != 0 && ci->client_playas <= MAX_PLAYERS) {
 					_network_player_info[p->index].months_empty = 0;
 					memcpy(_decode_parameters, ci->client_name, 32);
 					/* XXX - What are the consequents of this? It is needed, but is it bad? */
 					_docommand_recursive = 0;
 					DoCommandP(0, ci->client_playas-1, 0, NULL, CMD_CHANGE_PRESIDENT_NAME | CMD_MSG(STR_700D_CAN_T_CHANGE_PRESIDENT));
+				}
+			}
 		} else {
 			if (_network_server) {
 				NetworkClientInfo *ci;
 				// UGLY! p2 is mis-used to fetch the client-id
 				ci = &_network_client_info[p2];
 				ci->client_playas = OWNER_SPECTATOR;
 				NetworkUpdateClientInfo(ci->client_index);
+			}
 #endif /* ENABLE_NETWORK */
+		}
 		break;
 	case 1: // make new ai player
 		DoStartupNewPlayer(true);
 		break;
 	case 2: // delete player
 		p = DEREF_PLAYER(p2);
 		/* Only allow removal of HUMAN companies */
 		if (IS_HUMAN_PLAYER(p2)) {
 			/* Delete any open window of the company */
 			DeletePlayerWindows(p2);
 			/* Show the bankrupt news */
 			SetDParam(0, p->name_1);
 			SetDParam(1, p->name_2);
 			AddNewsItem( (StringID)(p2 + 16*3), NEWS_FLAGS(NM_CALLBACK, 0, NT_COMPANY_INFO, DNC_BANKRUPCY),0,0);
 			/* Remove the company */
 			ChangeOwnershipOfPlayerItems(p2, 255);
 			p->money64 = p->player_money = 100000000;
 			p->is_active = false;
+		}
 		break;
 	case 3: // join player
 		pi = (byte)(p1 >> 8);
 		ChangeOwnershipOfPlayerItems(pi, (byte)(p1 >> 16));
 		DeletePlayerStuff(pi);
 		break;
+	}
 	return 0;
+}
 // Save/load of players
 static const byte _player_desc[] = {
 	SLE_VAR(Player,name_2,					SLE_UINT32),
 	SLE_VAR(Player,name_1,					SLE_STRINGID),
 	SLE_VAR(Player,president_name_1,SLE_UINT16),
 	SLE_VAR(Player,president_name_2,SLE_UINT32),
 	SLE_VAR(Player,face,						SLE_UINT32),
 	// money was changed to a 64 bit field in savegame version 1.
 	SLE_CONDVAR(Player,money64,			SLE_VAR_I64 | SLE_FILE_I32, 0, 0),
 	SLE_CONDVAR(Player,money64,			SLE_INT64, 1, 255),
 	SLE_VAR(Player,current_loan,		SLE_INT32),
 	SLE_VAR(Player,player_color,		SLE_UINT8),
 	SLE_VAR(Player,player_money_fraction,SLE_UINT8),
 	SLE_VAR(Player,max_railtype,		SLE_UINT8),
 	SLE_VAR(Player,block_preview,		SLE_UINT8),
 	SLE_VAR(Player,cargo_types,			SLE_UINT16),
 	SLE_VAR(Player,location_of_house,SLE_UINT16),
 	SLE_VAR(Player,last_build_coordinate,SLE_UINT16),
 	SLE_VAR(Player,inaugurated_year,SLE_UINT8),
 	SLE_ARR(Player,share_owners,		SLE_UINT8, 4),
 	SLE_VAR(Player,num_valid_stat_ent,SLE_UINT8),
 	SLE_VAR(Player,quarters_of_bankrupcy,SLE_UINT8),
 	SLE_VAR(Player,bankrupt_asked,	SLE_UINT8),
 	SLE_VAR(Player,bankrupt_timeout,SLE_INT16),

0 comments (0 inline, 0 general)