fix rare stuttering issue on low prediction

sjrc6 · Sep 30, 2024 · 1f87cbe · 1f87cbe
1 parent d9c8a5f
commit 1f87cbe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/game/client/components/controls.cpp b/src/game/client/components/controls.cpp
@@ -492,9 +492,10 @@ bool CControls::CheckNewInput()
 		TestInput.m_TargetY *= m_pClient->m_Camera.m_Zoom;
 	}
 
+	m_FastInput = TestInput;
+
 	if (NewInput) 
 	{
-		m_FastInput = TestInput;
 		return true;
 	}
 	return false;

diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp
@@ -316,11 +316,11 @@ void CGameClient::OnInit()
 
 	if(GIT_SHORTREV_HASH)
 	{
-		str_format(m_aDDNetVersionStr, sizeof(m_aDDNetVersionStr), "%s %s (%s)", GAME_NAME, GAME_RELEASE_VERSION, GIT_SHORTREV_HASH);
+		str_format(m_aDDNetVersionStr, sizeof(m_aDDNetVersionStr), "%s %s (%s)", CLIENT_NAME, GAME_RELEASE_VERSION, GIT_SHORTREV_HASH);
 	}
 	else
 	{
-		str_format(m_aDDNetVersionStr, sizeof(m_aDDNetVersionStr), "%s %s", GAME_NAME, GAME_RELEASE_VERSION);
+		str_format(m_aDDNetVersionStr, sizeof(m_aDDNetVersionStr), "%s %s", CLIENT_NAME, GAME_RELEASE_VERSION);
 	}
 
 	// set the language
@@ -2209,7 +2209,7 @@ void CGameClient::OnPredict()
 			m_PrevPredictedWorld.CopyWorld(&m_PredictedWorld);
 			m_PredictedPrevChar = pLocalChar->GetCore();
 		}
-		if(Tick == FinalTick - (1 - g_Config.m_ClFastInputOthers))
+		if(Tick == FinalTick - std::max(g_Config.m_ClFastInput - g_Config.m_ClFastInputOthers, 0))
 		{
 			for(int i = 0; i < MAX_CLIENTS; i++)
 				if(CCharacter *pChar = m_PredictedWorld.GetCharacterById(i))
@@ -2246,7 +2246,7 @@ void CGameClient::OnPredict()
 		{
 			m_PredictedChar = pLocalChar->GetCore();
 		}
-		if (Tick == FinalTick - (1 - g_Config.m_ClFastInputOthers)) 
+		if(Tick == FinalTick - std::max(g_Config.m_ClFastInput - g_Config.m_ClFastInputOthers, 0)) 
 		{
 			for(int i = 0; i < MAX_CLIENTS; i++)
 				if(CCharacter *pChar = m_PredictedWorld.GetCharacterById(i))