diff --git a/src/cvars.cpp b/src/cvars.cpp index 32dffe32e..233fa1d0e 100644 --- a/src/cvars.cpp +++ b/src/cvars.cpp @@ -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_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_zvote_delay = NetVar("zvote_delay", "20").values(CV_Unsigned); diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 0ddb7ddcb..cdd2a987a 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -5008,32 +5008,21 @@ static void HandlePacketFromPlayer(SINT8 node) && !resendingsavegame[node] && savegameresendcooldown[node] <= I_GetTime() && !SV_ResendingSavegameToAnyone()) { - if (cv_resynchattempts.value) - { - // Tell the client we are about to resend them the gamestate - netbuffer->packettype = PT_WILLRESENDGAMESTATE; - HSendPacket(node, true, 0, 0); + // Tell the client we are about to resend them the gamestate + netbuffer->packettype = PT_WILLRESENDGAMESTATE; + HSendPacket(node, true, 0, 0); - resendingsavegame[node] = true; + resendingsavegame[node] = true; - if (cv_blamecfail.value) - CONS_Printf(M_GetText("Synch failure for player %d (%s); expected %hd, got %hd\n"), - netconsole+1, player_names[netconsole], - consistancy[realstart%BACKUPTICS], - SHORT(netbuffer->u.clientpak.consistancy)); - DEBFILE(va("Restoring player %d (synch failure) [%update] %d!=%d\n", - netconsole, realstart, consistancy[realstart%BACKUPTICS], - SHORT(netbuffer->u.clientpak.consistancy))); - 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; - } + if (cv_blamecfail.value) + CONS_Printf(M_GetText("Synch failure for player %d (%s); expected %hd, got %hd\n"), + netconsole+1, player_names[netconsole], + consistancy[realstart%BACKUPTICS], + SHORT(netbuffer->u.clientpak.consistancy)); + DEBFILE(va("Restoring player %d (synch failure) [%update] %d!=%d\n", + netconsole, realstart, consistancy[realstart%BACKUPTICS], + SHORT(netbuffer->u.clientpak.consistancy))); + break; } break; case PT_BASICKEEPALIVE: diff --git a/src/d_clisrv.h b/src/d_clisrv.h index 191dc0ee6..2cf336055 100644 --- a/src/d_clisrv.h +++ b/src/d_clisrv.h @@ -554,7 +554,7 @@ extern boolean server_lagless; extern consvar_t cv_mindelay; 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; #ifdef VANILLAJOINNEXTROUND diff --git a/src/menus/options-server-advanced.c b/src/menus/options-server-advanced.c index fa22a0997..cbe0fd4ec 100644 --- a/src/menus/options-server-advanced.c +++ b/src/menus/options-server-advanced.c @@ -27,9 +27,6 @@ menuitem_t OPTIONS_ServerAdvanced[] = {IT_HEADER, "Network Connection", NULL, 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.", NULL, {.cvar = &cv_maxping}, 0, 0},