Attachment #254707 for bug #345691

View | Details | Raw Unified | Return to bug 345691
Collapse All | Expand All

Lines 412-419 Link Here

(-)src/network/network_server.cpp (-2 / +1 lines)
412	}	412	}
413	/* Send all packets (forced) and check if we have send it all */	413	/* Send all packets (forced) and check if we have send it all */
414	cs->Send_Packets();	414	if (cs->Send_Packets() && cs->IsPacketQueueEmpty()) {
415	if (cs->IsPacketQueueEmpty()) {
416	/* All are sent, increase the sent_packets */	415	/* All are sent, increase the sent_packets */
417	sent_packets *= 2;	416	sent_packets *= 2;
418	} else {	417	} else {




	FOR_ALL_CLIENT_SOCKETS(cs) {
		if (!_network_server) {
			SEND_COMMAND(PACKET_CLIENT_QUIT)();
			cs->Send_Packets(true);
		}
		NetworkCloseClient(cs, NETWORK_RECV_STATUS_CONN_LOST);
	}

	NetworkClientSocket *cs;
	FOR_ALL_CLIENT_SOCKETS(cs) {
		if (cs->writable) {
			if (cs->Send_Packets() && cs->status == STATUS_MAP) {

			if (cs->status == STATUS_MAP) {
				/* This client is in the middle of a map-send, call the function for that */
				SEND_COMMAND(PACKET_SERVER_MAP)(cs);
			}

Return to bug 345691

Lines 675-681 Link Here

(-)src/network/network.cpp (-4 / +2 lines)
675	FOR_ALL_CLIENT_SOCKETS(cs) {	675	FOR_ALL_CLIENT_SOCKETS(cs) {
676	if (!_network_server) {	676	if (!_network_server) {
677	SEND_COMMAND(PACKET_CLIENT_QUIT)();	677	SEND_COMMAND(PACKET_CLIENT_QUIT)();
678	cs->Send_Packets();	678	cs->Send_Packets(true);
679	}	679	}
680	NetworkCloseClient(cs, NETWORK_RECV_STATUS_CONN_LOST);	680	NetworkCloseClient(cs, NETWORK_RECV_STATUS_CONN_LOST);
681	}	681	}
Lines 1006-1014 Link Here
1006	NetworkClientSocket *cs;	1006	NetworkClientSocket *cs;
1007	FOR_ALL_CLIENT_SOCKETS(cs) {	1007	FOR_ALL_CLIENT_SOCKETS(cs) {
1008	if (cs->writable) {	1008	if (cs->writable) {
1009	cs->Send_Packets();	1009	if (cs->Send_Packets() && cs->status == STATUS_MAP) {
1010
1011	if (cs->status == STATUS_MAP) {
1012	/* This client is in the middle of a map-send, call the function for that */	1010	/* This client is in the middle of a map-send, call the function for that */
1013	SEND_COMMAND(PACKET_SERVER_MAP)(cs);	1011	SEND_COMMAND(PACKET_SERVER_MAP)(cs);
1014	}	1012	}