From c3417ca08da09a837a4fc5ce65db65ce487291bb Mon Sep 17 00:00:00 2001 From: nillerusr Date: Mon, 13 Feb 2023 00:27:40 +0300 Subject: [PATCH] engine: fix cmdrate/updaterate values --- engine/baseclient.cpp | 2 +- engine/masterserver.cpp | 1 + engine/sv_client.cpp | 4 ++-- engine/sv_main.cpp | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/engine/baseclient.cpp b/engine/baseclient.cpp index ed81068f..4ec46652 100644 --- a/engine/baseclient.cpp +++ b/engine/baseclient.cpp @@ -1431,7 +1431,7 @@ void CBaseClient::UpdateUserSettings() SetRate( rate, false ); // set server to client update rate - SetUpdateRate( m_ConVars->GetInt( "cl_updaterate", 20), false ); + SetUpdateRate( m_ConVars->GetInt( "cl_updaterate", 60), false ); SetMaxRoutablePayloadSize( m_ConVars->GetInt( "net_maxroutable", MAX_ROUTABLE_PAYLOAD ) ); diff --git a/engine/masterserver.cpp b/engine/masterserver.cpp index 42eb37ca..ced9aa81 100644 --- a/engine/masterserver.cpp +++ b/engine/masterserver.cpp @@ -161,6 +161,7 @@ void CMaster::RunFrame() { m_serverListResponse->RefreshComplete( NServerResponse::nServerFailedToRespond ); StopRefresh(); + return; } if( m_iServersResponded > 0 && diff --git a/engine/sv_client.cpp b/engine/sv_client.cpp index 6279a267..566cbeee 100644 --- a/engine/sv_client.cpp +++ b/engine/sv_client.cpp @@ -41,8 +41,8 @@ static ConVar sv_timeout( "sv_timeout", "65", 0, "After this many seconds withou static ConVar sv_maxrate( "sv_maxrate", "0", FCVAR_REPLICATED, "Max bandwidth rate allowed on server, 0 == unlimited" ); static ConVar sv_minrate( "sv_minrate", "3500", FCVAR_REPLICATED, "Min bandwidth rate allowed on server, 0 == unlimited" ); - ConVar sv_maxupdaterate( "sv_maxupdaterate", "66", FCVAR_REPLICATED, "Maximum updates per second that the server will allow" ); - ConVar sv_minupdaterate( "sv_minupdaterate", "10", FCVAR_REPLICATED, "Minimum updates per second that the server will allow" ); + ConVar sv_maxupdaterate( "sv_maxupdaterate", "100", FCVAR_REPLICATED, "Maximum updates per second that the server will allow" ); + ConVar sv_minupdaterate( "sv_minupdaterate", "20", FCVAR_REPLICATED, "Minimum updates per second that the server will allow" ); ConVar sv_stressbots("sv_stressbots", "0", FCVAR_DEVELOPMENTONLY, "If set to 1, the server calculates data and fills packets to bots. Used for perf testing."); static ConVar sv_allowdownload ("sv_allowdownload", "1", 0, "Allow clients to download files"); diff --git a/engine/sv_main.cpp b/engine/sv_main.cpp index 1456e44d..1d104966 100644 --- a/engine/sv_main.cpp +++ b/engine/sv_main.cpp @@ -218,8 +218,8 @@ static ConVar sv_voicecodec( "sv_voicecodec", "vaudio_opus", 0, "steam - Use Steam voice API" ); -ConVar sv_mincmdrate( "sv_mincmdrate", "10", FCVAR_REPLICATED, "This sets the minimum value for cl_cmdrate. 0 == unlimited." ); -ConVar sv_maxcmdrate( "sv_maxcmdrate", "66", FCVAR_REPLICATED, "(If sv_mincmdrate is > 0), this sets the maximum value for cl_cmdrate." ); +ConVar sv_mincmdrate( "sv_mincmdrate", "20", FCVAR_REPLICATED, "This sets the minimum value for cl_cmdrate. 0 == unlimited." ); +ConVar sv_maxcmdrate( "sv_maxcmdrate", "100", FCVAR_REPLICATED, "(If sv_mincmdrate is > 0), this sets the maximum value for cl_cmdrate." ); ConVar sv_client_cmdrate_difference( "sv_client_cmdrate_difference", "20", FCVAR_REPLICATED, "cl_cmdrate is moved to within sv_client_cmdrate_difference units of cl_updaterate before it " "is clamped between sv_mincmdrate and sv_maxcmdrate." );