...

Author: wopox1337

rehlds/engine/server.h

@@ -378,6 +378,7 @@ extern cvar_t sv_rehlds_attachedentities_playeranimationspeed_fix;
 extern cvar_t sv_rehlds_local_gametime;
 extern cvar_t sv_rehlds_send_mapcycle;
 extern cvar_t sv_usercmd_custom_random_seed;
+extern cvar_t sv_maxusrcmdprocessticks;
 extern cvar_t sv_maxusrcmdprocessticks_warning;
 #endif
 extern int sv_playermodel;

rehlds/engine/sv_main.cpp

@@ -210,7 +210,8 @@ cvar_t sv_rehlds_send_mapcycle = { "sv_rehlds_send_mapcycle", "0", 0, 0.0f, null
 cvar_t sv_rehlds_maxclients_from_single_ip = { "sv_rehlds_maxclients_from_single_ip", "5", 0, 5.0f, nullptr };
 cvar_t sv_use_entity_file = { "sv_use_entity_file", "0", 0, 0.0f, nullptr };
 cvar_t sv_usercmd_custom_random_seed = { "sv_usercmd_custom_random_seed", "0", 0, 0.0f, nullptr };
-cvar_t sv_maxusrcmdprocessticks_warning = { "sv_maxusrcmdprocessticks_warning", "0", 0, 0.0f, nullptr };
+cvar_t sv_maxusrcmdprocessticks = { "sv_maxusrcmdprocessticks", "16", 0, 0.0f, nullptr };
+cvar_t sv_maxusrcmdprocessticks_warning = { "sv_maxusrcmdprocessticks_warning", "-1", 0, 0.0f, nullptr };
 #endif
 
 delta_t *SV_LookupDelta(char *name)
@@ -8026,6 +8027,7 @@ void SV_Init(void)
 	Cvar_RegisterVariable(&sv_rollangle);
 	Cvar_RegisterVariable(&sv_use_entity_file);
 	Cvar_RegisterVariable(&sv_usercmd_custom_random_seed);
+	Cvar_RegisterVariable(&sv_maxusrcmdprocessticks);
 	Cvar_RegisterVariable(&sv_maxusrcmdprocessticks_warning);
 #endif
 

rehlds/engine/sv_user.cpp

@@ -754,30 +754,6 @@ void SV_ForceFullClientsUpdate(void)
 
 void SV_RunCmd(usercmd_t *ucmd, int random_seed)
 {
-#ifdef REHLDS_FIXES
-	auto gameClient = g_GameClients[host_client - g_psvs.clients];
-	float playerFrameTime = (1.0f / sys_ticrate.value);
-	float flTimeAllowedForProcessing = gameClient->ConsumeMovementTimeForUserCmdProcessing( playerFrameTime );
-	bool isBot = host_client->fakeclient;
-	if ( !isBot && ( flTimeAllowedForProcessing < playerFrameTime ) )
-	{
-		// Make sure that the activity in command is erased because player cheated or dropped too many packets
-		double dblWarningFrequencyThrottle = sv_maxusrcmdprocessticks_warning.value;
-		if ( dblWarningFrequencyThrottle >= 0.0 )
-		{
-			static double s_dblLastWarningTime = 0.0;
-			double dblTimeNow = Sys_FloatTime();
-			if ( !s_dblLastWarningTime || ( dblTimeNow - s_dblLastWarningTime >= dblWarningFrequencyThrottle ) )
-			{
-				s_dblLastWarningTime = dblTimeNow;
-				Con_Printf( "sv_maxusrcmdprocessticks_warning at server tick %u: Ignored client %s usrcmd (%.6f < %.6f)!\n",
-					/* System::GetTick() */ 1337, host_client->name, flTimeAllowedForProcessing, playerFrameTime );
-			}
-		}
-		return; // Don't process this command
-	}
-#endif // REHLDS_FIXES
-
 	usercmd_t cmd = *ucmd;
 	int i;
 	edict_t *ent;
@@ -814,6 +790,54 @@ void SV_RunCmd(usercmd_t *ucmd, int random_seed)
 	}
 #endif
 
+#ifdef REHLDS_FIXES
+	#define TICK_INTERVAL (1.0f / sys_ticrate.value)
+
+	CGameClient* gameClient = g_GameClients[host_client - g_psvs.clients];
+	bool bRunNullCmd = false;
+	if (int numUsrCmdProcessTicksMax = (int)sv_maxusrcmdprocessticks.value)
+	{
+		// Grant the client some time buffer to execute user commands
+		gameClient->m_flMovementTimeForUserCmdProcessingRemaining += TICK_INTERVAL;
+
+		// but never accumulate more than N ticks
+		if (gameClient->GetRemainingMovementTimeForUserCmdProcessing() > numUsrCmdProcessTicksMax * TICK_INTERVAL)
+		{
+			gameClient->m_flMovementTimeForUserCmdProcessingRemaining = numUsrCmdProcessTicksMax * TICK_INTERVAL;
+			bRunNullCmd = true;
+		}
+	}
+	/*else
+	{
+		// Otherwise we don't care to track time
+		m_flMovementTimeForUserCmdProcessingRemaining = FLT_MAX;
+	}
+	*/
+
+	float playerFrameTime = TICK_INTERVAL;
+	float flTimeAllowedForProcessing = gameClient->ConsumeMovementTimeForUserCmdProcessing(playerFrameTime);
+	bool isBot = host_client->fakeclient;
+
+	if (!isBot && (flTimeAllowedForProcessing < playerFrameTime))
+	{
+		// Make sure that the activity in command is erased because player cheated or dropped too many packets
+		double dblWarningFrequencyThrottle = sv_maxusrcmdprocessticks_warning.value;
+		if (dblWarningFrequencyThrottle >= 0.0)
+		{
+			static double s_dblLastWarningTime = 0.0;
+			double dblTimeNow = Sys_FloatTime();
+			if (!s_dblLastWarningTime || (dblTimeNow - s_dblLastWarningTime >= dblWarningFrequencyThrottle))
+			{
+				s_dblLastWarningTime = dblTimeNow;
+				Con_Printf("sv_maxusrcmdprocessticks_warning at server tick %u: Ignored client %s usrcmd (%.6f < %.6f)!\n",
+					/* System::GetTick() */ 123, host_client->name, flTimeAllowedForProcessing, playerFrameTime);
+			}
+		}
+
+		return; // Don't process this command
+	}
+#endif // REHLDS_FIXES
+
 	gEntityInterface.pfnCmdStart(sv_player, ucmd, random_seed);
 	frametime = float(ucmd->msec * 0.001);
 	host_client->svtimebase = frametime + host_client->svtimebase;

rehlds/rehlds/rehlds_interfaces_impl.h

@@ -67,9 +67,6 @@ class CGameClient : public IGameClient
 
 #ifdef REHLDS_FIXES
 	double m_localGameTimeBase;
-
-	// How much of a movement time buffer can we process from this user?
-	float m_flMovementTimeForUserCmdProcessingRemaining;
 #endif
 public:
 	CGameClient(int id, client_t* cl);
@@ -254,6 +251,9 @@ class CGameClient : public IGameClient
 	void SetupLocalGameTime() { m_localGameTimeBase = g_psv.time; }
 	double GetLocalGameTime() const { return g_psv.time - m_localGameTimeBase; }
 	double GetLocalGameTimeBase() const { return m_localGameTimeBase; }
+	
+	// How much of a movement time buffer can we process from this user?
+	float m_flMovementTimeForUserCmdProcessingRemaining;
 
 	float GetRemainingMovementTimeForUserCmdProcessing() const { return m_flMovementTimeForUserCmdProcessingRemaining; }
 	float ConsumeMovementTimeForUserCmdProcessing( float flTimeNeeded )