From 0b3e7240a8594c72341f8fa662fb39028cd2e3cd Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 6 Oct 2024 12:07:17 +0200 Subject: [PATCH] use saturn packet to determine if client can receive gamestate before the server always assumed every client cant receive the gamestate using the vanilla consistency check for everyone. aswell as before the first resynch it tried to send the gamestate resend packets to everyone --- src/Makefile | 12 ++++++------ src/d_clisrv.c | 46 +++++++++++++++++++--------------------------- src/doomdef.h | 6 +++--- 3 files changed, 28 insertions(+), 36 deletions(-) diff --git a/src/Makefile b/src/Makefile index 4668518b9..87226a60b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -213,9 +213,9 @@ DOSATURNSYNCH=1 ifndef NOSATURNJOIN DOSATURNJOIN=1 endif -#ifndef NOSATURNPAK -#DOSATURNPAK=1 -#endif +ifndef NOSATURNPAK +DOSATURNPAK=1 +endif endif endif @@ -404,9 +404,9 @@ OPTS+=-DDOSATURNSYNCH ifndef NOSATURNJOIN OPTS+=-DDOSATURNJOIN endif -#ifndef NOSATURNPAK -#OPTS+=-DDOSATURNPAK -#endif +ifndef NOSATURNPAK +OPTS+=-DDOSATURNPAK +endif endif endif diff --git a/src/d_clisrv.c b/src/d_clisrv.c index f9110bb2d..ac0dfad34 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -5394,6 +5394,7 @@ static void HandlePacketFromPlayer(SINT8 node) && !resendingsavegame[node] && savegameresendcooldown[node] <= I_GetTime() && !SV_ResendingSavegameToAnyone())) { +#ifndef SATURNPAK // we need to send this so the client can tell us if it can receive the savegame netbuffer->packettype = PT_WILLRESENDGAMESTATE; HSendPacket(node, true, 0, 0); @@ -5405,6 +5406,21 @@ static void HandlePacketFromPlayer(SINT8 node) SV_RequireResynch(node); resendingsavegame[node] = false; } +#else + if (can_receive_gamestate[node]) + { + // Tell the client we are about to resend them the gamestate + netbuffer->packettype = PT_WILLRESENDGAMESTATE; + HSendPacket(node, true, 0, 0); + + resendingsavegame[node] = true; + } + else + { + SV_RequireResynch(node); + resendingsavegame[node] = false; + } +#endif if ((!can_receive_gamestate[node] && cv_resynchattempts.value && resynch_score[node] <= (unsigned)cv_resynchattempts.value*250) || (can_receive_gamestate[node] && (gamestate_resend_counter[node] < cv_gamestateattempts.value))) { @@ -5584,31 +5600,6 @@ static void HandlePacketFromPlayer(SINT8 node) else buf[1] = KICK_MSG_PLAYER_QUIT; SendNetXCmd(XD_KICK, &buf, 2); - //nodetoplayer[node] = -1; - - /*if (nodetoplayer2[node] != -1 && nodetoplayer2[node] >= 0 - && playeringame[(UINT8)nodetoplayer2[node]]) - { - buf[0] = nodetoplayer2[node]; - SendNetXCmd(XD_KICK, &buf, 2); - nodetoplayer2[node] = -1; - } - - if (nodetoplayer3[node] != -1 && nodetoplayer3[node] >= 0 - && playeringame[(UINT8)nodetoplayer3[node]]) - { - buf[0] = nodetoplayer3[node]; - SendNetXCmd(XD_KICK, &buf, 2); - nodetoplayer3[node] = -1; - } - - if (nodetoplayer4[node] != -1 && nodetoplayer4[node] >= 0 - && playeringame[(UINT8)nodetoplayer4[node]]) - { - buf[0] = nodetoplayer4[node]; - SendNetXCmd(XD_KICK, &buf, 2); - nodetoplayer4[node] = -1; - }*/ } Net_CloseConnection(node); nodeingame[node] = false; @@ -5799,6 +5790,7 @@ static void HandlePacketFromPlayer(SINT8 node) case PT_ISSATURN: //CONS_Printf("hi im on saturn%d\n", node); is_client_saturn[node] = true; + can_receive_gamestate[node] = true; break; #endif default: @@ -6634,7 +6626,7 @@ void NetKeepAlive(void) #ifdef MASTERSERVER MasterClient_Ticker(); #endif - + #ifdef HOLEPUNCH if (netgame && serverrunning) { @@ -6745,7 +6737,7 @@ void NetUpdate(void) CL_SendClientCmd(); // send it GetPackets(); // get packet from client or from server - + // client send the command after a receive of the server // the server send before because in single player is beter diff --git a/src/doomdef.h b/src/doomdef.h index bdc82a0ca..361cd92d1 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -585,9 +585,9 @@ extern const char *compdate, *comptime, *comprevision, *compbranch; /// Server detection for if a connecting client is on Saturn. /// For stuff like extra synching, etc. -//#ifdef DOSATURNPAK -//#define SATURNPAK -//#endif +#ifdef DOSATURNPAK +#define SATURNPAK +#endif //-- <( ̄︶ ̄)> __ #endif