From ec4104ec6cc1a944762afd663a00dcbb15555718 Mon Sep 17 00:00:00 2001
From: Rubidium <rubidium@openttd.org>
Date: Tue, 6 Feb 2024 18:56:56 +0100
Subject: [PATCH] Codechange: do not pass the socket when the receiver already
 knows it

---
 src/network/network_server.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index f0eba6d005..683774858e 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -116,10 +116,9 @@ struct PacketWriter : SaveFilter {
 	/**
 	 * Transfer all packets from here to the network's queue while holding
 	 * the lock on our mutex.
-	 * @param socket The network socket to write to.
 	 * @return True iff the last packet of the map has been sent.
 	 */
-	bool TransferToNetworkQueue(ServerNetworkGameSocketHandler *socket)
+	bool TransferToNetworkQueue()
 	{
 		/* Unsafe check for the queue being empty or not. */
 		if (this->packets.empty()) return false;
@@ -128,7 +127,7 @@ struct PacketWriter : SaveFilter {
 
 		while (!this->packets.empty()) {
 			bool last_packet = this->packets.front()->GetPacketType() == PACKET_SERVER_MAP_DONE;
-			socket->SendPacket(std::move(this->packets.front()));
+			this->cs->SendPacket(std::move(this->packets.front()));
 			this->packets.pop_front();
 
 			if (last_packet) return true;
@@ -577,7 +576,7 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::SendMap()
 	}
 
 	if (this->status == STATUS_MAP) {
-		bool last_packet = this->savegame->TransferToNetworkQueue(this);
+		bool last_packet = this->savegame->TransferToNetworkQueue();
 		if (last_packet) {
 			Debug(net, 9, "client[{}] SendMap(): last_packet", this->client_id);