From 2639dc176df55f14a5fa1310554d4d768da2d8c3 Mon Sep 17 00:00:00 2001
From: LJ Sonic <lamr@free.fr>
Date: Sat, 14 Jan 2023 14:52:13 +0100
Subject: [PATCH] Move net command copying to a new function

---
 src/netcode/net_command.c | 20 ++++++++++++++++++++
 src/netcode/net_command.h |  1 +
 src/netcode/tic_command.c | 21 +++------------------
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/netcode/net_command.c b/src/netcode/net_command.c
index 13477d42d..227b78660 100644
--- a/src/netcode/net_command.c
+++ b/src/netcode/net_command.c
@@ -304,6 +304,26 @@ void PT_TextCmd(SINT8 node, INT32 netconsole)
 	}
 }
 
+void SV_CopyNetCommandsToServerPacket(tic_t tic)
+{
+	servertics_pak *packet = &netbuffer->u.serverpak;
+	UINT8 *cmds = (UINT8*)&packet->cmds[packet->numslots * packet->numtics];
+	UINT8 numcmds;
+
+	numcmds = *cmds++;
+
+	for (UINT32 i = 0; i < numcmds; i++)
+	{
+		INT32 playernum = *cmds++; // playernum
+		size_t size = cmds[0]+1;
+
+		if (tic >= gametic) // Don't copy old net commands
+			M_Memcpy(D_GetTextcmd(tic, playernum), cmds, size);
+		cmds += size;
+	}
+}
+
+void CL_SendNetCommands(void)
 void SendKick(UINT8 playernum, UINT8 msg)
 {
 	UINT8 buf[2];
diff --git a/src/netcode/net_command.h b/src/netcode/net_command.h
index f1b4b2f3f..a9447ed7a 100644
--- a/src/netcode/net_command.h
+++ b/src/netcode/net_command.h
@@ -57,6 +57,7 @@ void ExtraDataTicker(void);
 size_t TotalTextCmdPerTic(tic_t tic);
 
 void PT_TextCmd(SINT8 node, INT32 netconsole);
+void SV_CopyNetCommandsToServerPacket(tic_t tic);
 void SendKick(UINT8 playernum, UINT8 msg);
 void SendKicksForNode(SINT8 node, UINT8 msg);
 
diff --git a/src/netcode/tic_command.c b/src/netcode/tic_command.c
index 417a2fdfd..2eb3b10ac 100644
--- a/src/netcode/tic_command.c
+++ b/src/netcode/tic_command.c
@@ -204,7 +204,6 @@ void PT_ClientCmd(SINT8 node, INT32 netconsole)
 
 void PT_ServerTics(SINT8 node, INT32 netconsole)
 {
-	UINT8 *pak, *txtpak, numtxtpak;
 	tic_t realend, realstart;
 
 	if (!netnodes[node].ingame)
@@ -230,19 +229,15 @@ void PT_ServerTics(SINT8 node, INT32 netconsole)
 	realstart = netbuffer->u.serverpak.starttic;
 	realend = realstart + netbuffer->u.serverpak.numtics;
 
-	txtpak = (UINT8 *)&netbuffer->u.serverpak.cmds[netbuffer->u.serverpak.numslots
-		* netbuffer->u.serverpak.numtics];
-
 	if (realend > gametic + CLIENTBACKUPTICS)
 		realend = gametic + CLIENTBACKUPTICS;
 	cl_packetmissed = realstart > neededtic;
 
 	if (realstart <= neededtic && realend > neededtic)
 	{
-		tic_t i, j;
-		pak = (UINT8 *)&netbuffer->u.serverpak.cmds;
+		UINT8 *pak = (UINT8 *)&netbuffer->u.serverpak.cmds;
 
-		for (i = realstart; i < realend; i++)
+		for (tic_t i = realstart; i < realend; i++)
 		{
 			// clear first
 			D_Clearticcmd(i);
@@ -251,17 +246,7 @@ void PT_ServerTics(SINT8 node, INT32 netconsole)
 			pak = G_ScpyTiccmd(netcmds[i%BACKUPTICS], pak,
 				netbuffer->u.serverpak.numslots*sizeof (ticcmd_t));
 
-			// copy the textcmds
-			numtxtpak = *txtpak++;
-			for (j = 0; j < numtxtpak; j++)
-			{
-				INT32 k = *txtpak++; // playernum
-				const size_t txtsize = txtpak[0]+1;
-
-				if (i >= gametic) // Don't copy old net commands
-					M_Memcpy(D_GetTextcmd(i, k), txtpak, txtsize);
-				txtpak += txtsize;
-			}
+			SV_CopyNetCommandsToServerPacket(i);
 		}
 
 		neededtic = realend;