thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Delete resynchattempts

Browse source 
All values besides 0 and 1 have been unused for a while. Quite frankly, if the gamestate resend doesn't fix them, a rejoin won't either, so kicking them is just adding extra steps.
This commit is contained in:
Sally Coolatta 2024-10-22 02:57:05 -04:00
parent 45bbb4826a
commit 6bf5662ca8
4 changed files with 14 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/cvars.cpp
View file

@ -620,7 +620,6 @@ consvar_t cv_maxsend = NetVar("maxsend", "51200").min_max(0, 51200);
consvar_t cv_noticedownload = NetVar("noticedownload", "Off").on_off(); consvar_t cv_noticedownload = NetVar("noticedownload", "Off").on_off();
consvar_t cv_pingtimeout = NetVar("maxdelaytimeout", "10").min_max(8, 120); consvar_t cv_pingtimeout = NetVar("maxdelaytimeout", "10").min_max(8, 120);
consvar_t cv_resynchattempts = NetVar("resynchattempts", "2").min_max(1, 20, {{0, "No"}});
consvar_t cv_showjoinaddress = NetVar("showjoinaddress", "Off").on_off(); consvar_t cv_showjoinaddress = NetVar("showjoinaddress", "Off").on_off();
consvar_t cv_zvote_delay = NetVar("zvote_delay", "20").values(CV_Unsigned); consvar_t cv_zvote_delay = NetVar("zvote_delay", "20").values(CV_Unsigned);

37
src/d_clisrv.c
View file

@ -5008,32 +5008,21 @@ static void HandlePacketFromPlayer(SINT8 node)
&& !resendingsavegame[node] && savegameresendcooldown[node] <= I_GetTime() && !resendingsavegame[node] && savegameresendcooldown[node] <= I_GetTime()
&& !SV_ResendingSavegameToAnyone()) && !SV_ResendingSavegameToAnyone())
{ {
if (cv_resynchattempts.value) // Tell the client we are about to resend them the gamestate
{ netbuffer->packettype = PT_WILLRESENDGAMESTATE;
// Tell the client we are about to resend them the gamestate HSendPacket(node, true, 0, 0);
netbuffer->packettype = PT_WILLRESENDGAMESTATE;
HSendPacket(node, true, 0, 0);
resendingsavegame[node] = true; resendingsavegame[node] = true;
if (cv_blamecfail.value) if (cv_blamecfail.value)
CONS_Printf(M_GetText("Synch failure for player %d (%s); expected %hd, got %hd\n"), CONS_Printf(M_GetText("Synch failure for player %d (%s); expected %hd, got %hd\n"),
netconsole+1, player_names[netconsole], netconsole+1, player_names[netconsole],
consistancy[realstart%BACKUPTICS], consistancy[realstart%BACKUPTICS],
SHORT(netbuffer->u.clientpak.consistancy)); SHORT(netbuffer->u.clientpak.consistancy));
DEBFILE(va("Restoring player %d (synch failure) [%update] %d!=%d\n", DEBFILE(va("Restoring player %d (synch failure) [%update] %d!=%d\n",
netconsole, realstart, consistancy[realstart%BACKUPTICS], netconsole, realstart, consistancy[realstart%BACKUPTICS],
SHORT(netbuffer->u.clientpak.consistancy))); SHORT(netbuffer->u.clientpak.consistancy)));
break; break;
}
else
{
SendKick(netconsole, KICK_MSG_CON_FAIL);
DEBFILE(va("player %d kicked (synch failure) [%u] %d!=%d\n",
netconsole, realstart, consistancy[realstart%BACKUPTICS],
SHORT(netbuffer->u.clientpak.consistancy)));
break;
}
} }
break; break;
case PT_BASICKEEPALIVE: case PT_BASICKEEPALIVE:

2
src/d_clisrv.h
View file

@ -554,7 +554,7 @@ extern boolean server_lagless;
extern consvar_t cv_mindelay; extern consvar_t cv_mindelay;
extern consvar_t cv_netticbuffer, cv_allownewplayer, cv_maxconnections, cv_joindelay; extern consvar_t cv_netticbuffer, cv_allownewplayer, cv_maxconnections, cv_joindelay;
extern consvar_t cv_pingtimeout, cv_resynchattempts, cv_blamecfail; extern consvar_t cv_pingtimeout, cv_blamecfail;
extern consvar_t cv_maxsend, cv_noticedownload, cv_downloadspeed; extern consvar_t cv_maxsend, cv_noticedownload, cv_downloadspeed;
#ifdef VANILLAJOINNEXTROUND #ifdef VANILLAJOINNEXTROUND

3
src/menus/options-server-advanced.c
View file

@ -27,9 +27,6 @@ menuitem_t OPTIONS_ServerAdvanced[] =
{IT_HEADER, "Network Connection", NULL, {IT_HEADER, "Network Connection", NULL,
NULL, {NULL}, 0, 0}, NULL, {NULL}, 0, 0},
{IT_STRING | IT_CVAR, "Resynch. Attempts", "How many times to attempt sending data to desynchronized players.",
NULL, {.cvar = &cv_resynchattempts}, 0, 0},
{IT_STRING | IT_CVAR, "Delay Limit (tics)", "Players above the delay limit will get kicked from the server.", {IT_STRING | IT_CVAR, "Delay Limit (tics)", "Players above the delay limit will get kicked from the server.",
NULL, {.cvar = &cv_maxping}, 0, 0}, NULL, {.cvar = &cv_maxping}, 0, 0},