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

Changeset - r717:02ff19796b81

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

truelight - 19 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

@@ @@ -487,54 +487,48 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER @@
+		}
 		_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 ;)

players.c

➞

Show inline comments

@@ @@ -632,50 +632,53 @@ static void DeletePlayerStuff(int pi) @@
 // 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;

0 comments (0 inline, 0 general)