openttd-mini: comparison src/network/network

equal deleted inserted replaced

-:ab59510b0c9c
+:a9508c166390
 		p->Send_uint16(ci->client_index);
 		p->Send_uint8 (ci->client_playas);
 		p->Send_string(ci->client_name);
 		p->Send_string(ci->unique_id);
-		NetworkSend_Packet(p, cs);
+		cs->Send_Packet(p);
 	}
 }
 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 (active);
-		NetworkSend_Packet(p, cs);
+		cs->Send_Packet(p);
 		return;
 	}
 	NetworkPopulateCompanyInfo();
 			p->Send_string("<none>");
 		} else {
 			p->Send_string(_network_player_info[player->index].players);
 		}
-		NetworkSend_Packet(p, cs);
+		cs->Send_Packet(p);
 	}
 	p = NetworkSend_Init(PACKET_SERVER_COMPANY_INFO);
 	p->Send_uint8 (NETWORK_COMPANY_INFO_VERSION);
 	p->Send_uint8 (0);
-	NetworkSend_Packet(p, cs);
+	cs->Send_Packet(p);
 }
 DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_ERROR)(NetworkTCPSocketHandler *cs, NetworkErrorCode error)
 {
 	//
 	char str[100];
 	Packet *p = NetworkSend_Init(PACKET_SERVER_ERROR);
 	p->Send_uint8(error);
-	NetworkSend_Packet(p, cs);
+	cs->Send_Packet(p);
 	GetNetworkErrorMsg(str, error, lastof(str));
 	// Only send when the current client was in game
 	if (cs->status > STATUS_AUTH) {
 	}
 	cs->has_quit = true;
 	// Make sure the data get's there before we close the connection
-	NetworkSend_Packets(cs);
+	cs->Send_Packets();
 	// The client made a mistake, so drop his connection now!
 	NetworkCloseClient(cs);
 }
 	p->Send_uint8 (grf_count);
 	for (c = _grfconfig; c != NULL; c = c->next) {
 		cs->Send_GRFIdentifier(p, c);
 	}
-	NetworkSend_Packet(p, cs);
+	cs->Send_Packet(p);
 }
 DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_NEED_PASSWORD)(NetworkTCPSocketHandler *cs, NetworkPasswordType type)
 {
 	//
 	//    uint8:  Type of password
 	//
 	Packet *p = NetworkSend_Init(PACKET_SERVER_NEED_PASSWORD);
 	p->Send_uint8(type);
-	NetworkSend_Packet(p, cs);
+	cs->Send_Packet(p);
 }
 DEF_SERVER_SEND_COMMAND(PACKET_SERVER_WELCOME)
 {
 	//
 	cs->status = STATUS_AUTH;
 	_network_game_info.clients_on++;
 	p = NetworkSend_Init(PACKET_SERVER_WELCOME);
 	p->Send_uint16(cs->index);
-	NetworkSend_Packet(p, cs);
+	cs->Send_Packet(p);
 		// Transmit info about all the active clients
 	FOR_ALL_CLIENTS(new_cs) {
 		if (new_cs != cs && new_cs->status > STATUS_AUTH)
 			SEND_COMMAND(PACKET_SERVER_CLIENT_INFO)(cs, DEREF_CLIENT_INFO(new_cs));
 		if (new_cs->status == STATUS_MAP_WAIT) waiting++;
 	}
 	p = NetworkSend_Init(PACKET_SERVER_WAIT);
 	p->Send_uint8(waiting);
-	NetworkSend_Packet(p, cs);
+	cs->Send_Packet(p);
 }
 // This sends the map to the client
 DEF_SERVER_SEND_COMMAND(PACKET_SERVER_MAP)
 {
 		// Now send the _frame_counter and how many packets are coming
 		p = NetworkSend_Init(PACKET_SERVER_MAP);
 		p->Send_uint8 (MAP_PACKET_START);
 		p->Send_uint32(_frame_counter);
 		p->Send_uint32(ftell(file_pointer));
-		NetworkSend_Packet(p, cs);
+		cs->Send_Packet(p);
 		fseek(file_pointer, 0, SEEK_SET);
 		sent_packets = 4; // We start with trying 4 packets
 			res = (int)fread(p->buffer + p->size, 1, SEND_MTU - p->size, file_pointer);
 			if (ferror(file_pointer)) error("Error reading temporary network savegame!");
 			p->size += res;
-			NetworkSend_Packet(p, cs);
+			cs->Send_Packet(p);
 			if (feof(file_pointer)) {
 				// Done reading!
 				Packet *p = NetworkSend_Init(PACKET_SERVER_MAP);
 				p->Send_uint8(MAP_PACKET_END);
-				NetworkSend_Packet(p, cs);
+				cs->Send_Packet(p);
 				// Set the status to DONE_MAP, no we will wait for the client
 				//  to send it is ready (maybe that happens like never ;))
 				cs->status = STATUS_DONE_MAP;
 				fclose(file_pointer);
 				break;
 			}
 		}
 		// Send all packets (forced) and check if we have send it all
-		NetworkSend_Packets(cs);
+		cs->Send_Packets();
-		if (cs->packet_queue == NULL) {
+		if (cs->IsPacketQueueEmpty()) {
 			// All are sent, increase the sent_packets
 			sent_packets *= 2;
 		} else {
 			// Not everything is sent, decrease the sent_packets
 			if (sent_packets > 1) sent_packets /= 2;
 	Packet *p = NetworkSend_Init(PACKET_SERVER_JOIN);
 	p->Send_uint16(client_index);
-	NetworkSend_Packet(p, cs);
+	cs->Send_Packet(p);
 }
 DEF_SERVER_SEND_COMMAND(PACKET_SERVER_FRAME)
 {
 	p->Send_uint32(_sync_seed_1);
 #ifdef NETWORK_SEND_DOUBLE_SEED
 	p->Send_uint32(_sync_seed_2);
 #endif
 #endif
-	NetworkSend_Packet(p, cs);
+	cs->Send_Packet(p);
 }
 DEF_SERVER_SEND_COMMAND(PACKET_SERVER_SYNC)
 {
 	//
 	p->Send_uint32(_sync_seed_1);
 #ifdef NETWORK_SEND_DOUBLE_SEED
 	p->Send_uint32(_sync_seed_2);
 #endif
-	NetworkSend_Packet(p, cs);
+	cs->Send_Packet(p);
 }
 DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_COMMAND)(NetworkTCPSocketHandler *cs, CommandPacket *cp)
 {
 	//
 	p->Send_uint32(cp->tile);
 	p->Send_string(cp->text);
 	p->Send_uint8 (cp->callback);
 	p->Send_uint32(cp->frame);
-	NetworkSend_Packet(p, cs);
+	cs->Send_Packet(p);
 }
 DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_CHAT)(NetworkTCPSocketHandler *cs, NetworkAction action, uint16 client_index, bool self_send, const char *msg)
 {
 	//
 	p->Send_uint8 (action);
 	p->Send_uint16(client_index);
 	p->Send_uint8 (self_send);
 	p->Send_string(msg);
-	NetworkSend_Packet(p, cs);
+	cs->Send_Packet(p);
 }
 DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_ERROR_QUIT)(NetworkTCPSocketHandler *cs, uint16 client_index, NetworkErrorCode errorno)
 {
 	//
 	Packet *p = NetworkSend_Init(PACKET_SERVER_ERROR_QUIT);
 	p->Send_uint16(client_index);
 	p->Send_uint8 (errorno);
-	NetworkSend_Packet(p, cs);
+	cs->Send_Packet(p);
 }
 DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_QUIT)(NetworkTCPSocketHandler *cs, uint16 client_index, const char *leavemsg)
 {
 	//
 	Packet *p = NetworkSend_Init(PACKET_SERVER_QUIT);
 	p->Send_uint16(client_index);
 	p->Send_string(leavemsg);
-	NetworkSend_Packet(p, cs);
+	cs->Send_Packet(p);
 }
 DEF_SERVER_SEND_COMMAND(PACKET_SERVER_SHUTDOWN)
 {
 	//
 	// Data:
 	//     <none>
 	//
 	Packet *p = NetworkSend_Init(PACKET_SERVER_SHUTDOWN);
-	NetworkSend_Packet(p, cs);
+	cs->Send_Packet(p);
 }
 DEF_SERVER_SEND_COMMAND(PACKET_SERVER_NEWGAME)
 {
 	//
 	// Data:
 	//     <none>
 	//
 	Packet *p = NetworkSend_Init(PACKET_SERVER_NEWGAME);
-	NetworkSend_Packet(p, cs);
+	cs->Send_Packet(p);
 }
 DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_RCON)(NetworkTCPSocketHandler *cs, uint16 color, const char *command)
 {
 	Packet *p = NetworkSend_Init(PACKET_SERVER_RCON);
 	p->Send_uint16(color);
 	p->Send_string(command);
-	NetworkSend_Packet(p, cs);
+	cs->Send_Packet(p);
 }
 // **********
 // Receiving functions
 //   DEF_SERVER_RECEIVE_COMMAND has parameter: NetworkTCPSocketHandler *cs, Packet *p
 // Reads a packet from the stream
 bool NetworkServer_ReadPackets(NetworkTCPSocketHandler *cs)
 {
 	Packet *p;
 	NetworkRecvStatus res;
-	while ((p = NetworkRecv_Packet(cs, &res)) != NULL) {
+	while ((p = cs->Recv_Packet(&res)) != NULL) {
 		byte type = p->Recv_uint8();
 		if (type < PACKET_END && _network_server_packet[type] != NULL && !cs->has_quit) {
 			_network_server_packet[type](cs, p);
 		} else {
 			DEBUG(net, 0, "[server] received invalid packet type %d", type);

changeset 5902	a9508c166390
parent 5900	135d10dd7219
child 5918	f06b73812d5f