From 2d426ac38cc5bae925ddb460cdaaace125ce1adf Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 2 Dec 2025 21:50:44 +0100 Subject: [PATCH] reorder packets again --- src/d_clisrv.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 7df635952..d2edf6997 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -4821,7 +4821,6 @@ static const char *GetRefuseMessage(SINT8 node) } } - #ifdef SATURNJOIN const boolean issaturn = (((doomcom->datalength) == sizeof(clientconfig_pak)) && (cc->issaturn == ISSATURN)); // Check the packet length to skip garbo data! #endif @@ -5466,19 +5465,17 @@ static void HandlePacketFromAwayNode(SINT8 node) case PT_NEEDMAPICON: PT_NeedMapIcon(node); break; - case PT_CLIENTJOIN: - PT_ClientJoin(node); - break; case PT_SERVERSHUTDOWN: PT_ServerShutdown(node); break; - + case PT_CLIENTJOIN: + PT_ClientJoin(node); + break; case PT_SERVERTICS: // Do not remove my own server (we have just get a out of order packet) if (node == servernode) break; /* FALLTHRU */ - default: DEBFILE(va("unknown packet received (%d) from unknown host\n", netbuffer->packettype)); Net_CloseConnection(node); @@ -6035,6 +6032,14 @@ static void HandlePacketFromPlayer(SINT8 node) case PT_CLIENTQUIT: PT_ClientQuit(netconsole, node); break; +#ifdef SATURNPAK + case PT_CANRECEIVEGAMESTATE: + PT_CanReceiveGamestate(node); + break; + case PT_RECEIVEDGAMESTATE: + PT_ReceivedGamestate(node); + break; +#endif case PT_SERVERINFO: PT_ServerInfo(node); break; @@ -6048,18 +6053,11 @@ static void HandlePacketFromPlayer(SINT8 node) case PT_PING: PT_Ping(node); break; - case PT_SERVERCFG: - break; + case PT_FILEFRAGMENT: PT_FileFragmentFromPlayer(node); break; #ifdef SATURNPAK - case PT_CANRECEIVEGAMESTATE: - PT_CanReceiveGamestate(node); - break; - case PT_RECEIVEDGAMESTATE: - PT_ReceivedGamestate(node); - break; case PT_WILLRESENDGAMESTATE: PT_WillResendGamestate(); break; @@ -6068,12 +6066,14 @@ static void HandlePacketFromPlayer(SINT8 node) is_client_saturn[node] = true; break; #endif - case PT_CLIENTJOIN: - PT_ClientJoin(node); - break; case PT_SERVERSHUTDOWN: PT_ServerShutdown(node); break; + case PT_SERVERCFG: + break; + case PT_CLIENTJOIN: + PT_ClientJoin(node); + break; case PT_RESYNCHING: PT_Resynching(node); break;