fix: round networking rates to nearest tick interval on boundaries

This fixes an alignment issue with tickrate vs. networking rate.
Now, if our networking rate is within 1 unit of a tick interval,
we just jump to that tick interval. This makes for slightly
faster/slower networking packet rates inaccurate to the set
integer rate, but the difference is miniscule and provides
many benefits for synchronization purposes.

In CS:GO, the tickrate was changed to a value expressable by
an integer (64), this is the next best thing.

Author: mastercoms

src/engine/baseclient.cpp

@@ -201,9 +201,18 @@ void CBaseClient::SetUserCVar( const char *pchCvar, const char *value)
 
 void CBaseClient::SetUpdateRate(int udpaterate, bool bForce)
 {
-	udpaterate = clamp( udpaterate, 1.0f, 133.0f );
+	udpaterate = clamp( udpaterate, 1, 133 );
 
-	m_fSnapshotInterval = MAX( 1.0f / udpaterate, host_state.interval_per_tick );
+	float fSnapshotInterval = MAX( 1.0f / udpaterate, host_state.interval_per_tick );
+	float fTickInterval = host_state.interval_per_tick * ( TIME_TO_TICKS( fSnapshotInterval ) );
+
+	// If we're near a tick interval, round to it (since we're clamped to int)
+	if ( fSnapshotInterval - fTickInterval < 1.0f )
+	{
+		fSnapshotInterval = fTickInterval;
+	}
+
+	m_fSnapshotInterval = fSnapshotInterval;
 }
 
 int CBaseClient::GetUpdateRate(void) const
@@ -1431,7 +1440,7 @@ void CBaseClient::UpdateUserSettings()
 	SetRate( rate, false );
 
 	// set server to client update rate
-	SetUpdateRate( m_ConVars->GetInt( "cl_updaterate", 33), false );
+	SetUpdateRate( m_ConVars->GetInt( "cl_updaterate", 66), false );
 
 	SetMaxRoutablePayloadSize( m_ConVars->GetInt( "net_maxroutable", MAX_ROUTABLE_PAYLOAD ) );
 

src/engine/baseserver.cpp

@@ -2083,8 +2083,8 @@ CBaseClient *CBaseServer::CreateFakeClient( const char *name )
 
 	// fake some cvar settings
 	//fakeclient->SetUserCVar( "name", name ); // set already by Connect()
-	fakeclient->SetUserCVar( "rate", "30000" );
-	fakeclient->SetUserCVar( "cl_updaterate", "33" );
+	fakeclient->SetUserCVar( "rate", va( "%d", DEFAULT_RATE ) );
+	fakeclient->SetUserCVar( "cl_updaterate", "66" );
 	fakeclient->SetUserCVar( "cl_interp_ratio", "1.0" );
 	fakeclient->SetUserCVar( "cl_interp", "0.1" );
 	fakeclient->SetUserCVar( "cl_interpolate", "0" );

src/engine/cl_bounded_cvars.cpp

@@ -95,7 +95,17 @@ class CBoundedCvar_CmdRate : public ConVar_ServerBounded
 			}
 
 			// Then we clamp to the min/max values the server has set.
-			return clamp( flCmdRate, sv_mincmdrate.GetFloat(), sv_maxcmdrate.GetFloat() );
+			float fCmdRate = clamp( flCmdRate, sv_mincmdrate.GetFloat(), sv_maxcmdrate.GetFloat() );
+			// If we're near a tick interval, round to it (since we're clamped to int)
+			float fSnapshotInterval = 1.0f / fCmdRate;
+			float fTickInterval = host_state.interval_per_tick * ( TIME_TO_TICKS( fSnapshotInterval ) );
+
+			if ( fSnapshotInterval - fTickInterval < 1.0f )
+			{
+				fSnapshotInterval = fTickInterval;
+			}
+
+			return 1.0f / fSnapshotInterval;
 		}
 		else
 		{
@@ -119,7 +129,7 @@ class CBoundedCvar_UpdateRate : public ConVar_ServerBounded
 	CBoundedCvar_UpdateRate() :
 	  ConVar_ServerBounded( 
 		  "cl_updaterate",
-		  "33", 
+		  "66", 
 		  FCVAR_ARCHIVE | FCVAR_USERINFO | FCVAR_NOT_CONNECTED, 
 		  "Number of packets per second of updates you are requesting from the server" )
 	{
@@ -132,7 +142,17 @@ class CBoundedCvar_UpdateRate : public ConVar_ServerBounded
 		// This cvar only takes effect on the server anyway, and this is done there too,
 		// but we have this here so they'll get the **note thing telling them the value 
 		// isn't functioning the way they set it.		
-		return clamp( GetBaseFloatValue(), sv_minupdaterate.GetFloat(), sv_maxupdaterate.GetFloat() );
+		float fUpdateRate = clamp( GetBaseFloatValue(), sv_minupdaterate.GetFloat(), sv_maxupdaterate.GetFloat() );
+		// If we're near a tick interval, round to it (since we're clamped to int)
+		float fSnapshotInterval = 1.0f / fUpdateRate;
+		float fTickInterval = host_state.interval_per_tick * ( TIME_TO_TICKS( fSnapshotInterval ) );
+
+		if ( fSnapshotInterval - fTickInterval < 1.0f )
+		{
+			fSnapshotInterval = fTickInterval;
+		}
+
+		return 1.0f / fSnapshotInterval;
 	}
 };
 

src/engine/hltvserver.cpp

@@ -531,8 +531,8 @@ void CHLTVServer::StartMaster(CGameClient *client)
 	// set default user settings
 	m_MasterClient->m_ConVars->SetString( "name", tv_name.GetString() );
 	m_MasterClient->m_ConVars->SetString( "cl_team", "1" );
-	m_MasterClient->m_ConVars->SetString( "rate", "30000" );
-	m_MasterClient->m_ConVars->SetString( "cl_updaterate", "22" );
+	m_MasterClient->m_ConVars->SetString( "rate", va( "%d", DEFAULT_RATE ) );
+	m_MasterClient->m_ConVars->SetString( "cl_updaterate", "33" ); // this may not be necessary...
 	m_MasterClient->m_ConVars->SetString( "cl_interp_ratio", "1.0" );
 	m_MasterClient->m_ConVars->SetString( "cl_predict", "0" );
 

src/engine/replayserver.cpp

@@ -471,8 +471,8 @@ void CReplayServer::StartMaster(CGameClient *client)
 	ConVarRef replay_name( "replay_name" );
 	m_MasterClient->m_ConVars->SetString( "name", replay_name.GetString() );
 	m_MasterClient->m_ConVars->SetString( "cl_team", "1" );
-	m_MasterClient->m_ConVars->SetString( "rate", "30000" );
-	m_MasterClient->m_ConVars->SetString( "cl_updaterate", "22" );
+	m_MasterClient->m_ConVars->SetString( "rate", va( "%d", DEFAULT_RATE ));
+	m_MasterClient->m_ConVars->SetString( "cl_updaterate", "33" );
 	m_MasterClient->m_ConVars->SetString( "cl_interp_ratio", "1.0" );
 	m_MasterClient->m_ConVars->SetString( "cl_predict", "0" );
 

src/engine/sv_client.cpp

@@ -41,7 +41,7 @@ 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", "80000", 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_maxupdaterate( "sv_maxupdaterate", "66.67", 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_stressbots("sv_stressbots", "0", FCVAR_DEVELOPMENTONLY, "If set to 1, the server calculates data and fills packets to bots. Used for perf testing.");

src/game/client/cdll_bounded_cvars.cpp

@@ -99,15 +99,15 @@ class CBoundedCvar_Interp : public ConVar_ServerBounded
 public:
 	CBoundedCvar_Interp() :
 	  ConVar_ServerBounded( "cl_interp", 
-		  "0.1", 
+		  "0.0", 
 		  FCVAR_USERINFO | FCVAR_NOT_CONNECTED | FCVAR_ARCHIVE, 
 		  "Sets the interpolation amount (bounded by server interp ratio settings).", true, 0.0f, true, 0.2f )
 	  {
 	  }
 
 	  virtual float GetFloat() const
 	  {
-		  static const ConVar *pUpdateRate = g_pCVar->FindVar( "cl_updaterate" );
+		  static const ConVar_ServerBounded *pUpdateRate = static_cast<const ConVar_ServerBounded*>( g_pCVar->FindVar( "cl_updaterate" ) );
 		  static const ConVar *pMin = g_pCVar->FindVar( "sv_client_min_interp_ratio" );
 		  static const ConVar *pMax = g_pCVar->FindVar( "sv_client_max_interp_ratio" );
 		  if ( pUpdateRate && pMin && pMin->GetFloat() != -1 && pMax )
@@ -126,7 +126,7 @@ ConVar_ServerBounded *cl_interp = &cl_interp_var;
 
 float GetClientInterpAmount()
 {
-	static const ConVar *pUpdateRate = g_pCVar->FindVar( "cl_updaterate" );
+	static const ConVar_ServerBounded *pUpdateRate = static_cast<const ConVar_ServerBounded*>( g_pCVar->FindVar( "cl_updaterate" ) );
 	if ( pUpdateRate )
 	{
 		// #define FIXME_INTERP_RATIO

src/game/server/player.cpp

@@ -593,7 +593,7 @@ CBasePlayer::CBasePlayer( )
 
 	m_hZoomOwner = NULL;
 
-	m_nUpdateRate = 33;  // cl_updaterate defualt
+	m_nUpdateRate = 66;  // cl_updaterate defualt
 	m_fLerpTime = 0.1f; // cl_interp default
 	m_bPredictWeapons = true;
 	m_bLagCompensation = false;