Improved freeze update detection, fixed a bug with unfreeze delay helper

sjrc6 · Feb 22, 2022 · af7c9f9 · af7c9f9
1 parent 2d7911f
commit af7c9f9
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 8 deletions.
diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
@@ -4542,7 +4542,7 @@ int CClient::MaxLatencyTicks() const
 
 int CClient::PredictionMargin() const
 {
-	if(g_Config.m_ClAmIFrozen && g_Config.m_ClUnfreezeDelayHelper)
+	if(g_Config.m_ClAmIFrozen && g_Config.m_ClUnfreezeDelayHelper && m_CurGameTick[g_Config.m_ClDummy]-g_Config.m_ClFreezeTick > 12)
 		return -min(g_Config.m_ClWhatsMyPing * g_Config.m_ClUnfreezeHelperPercent / 100, g_Config.m_ClUnfreezeHelperLimit);
 
 	return g_Config.m_ClPredictionMargin;

diff --git a/src/game/client/components/controls.cpp b/src/game/client/components/controls.cpp
@@ -264,7 +264,7 @@ int CControls::SnapInput(int *pData)
 		m_InputData[g_Config.m_ClDummy].m_PlayerFlags = PLAYERFLAG_PLAYING;
 	}
 
-	if(m_pClient->m_Scoreboard.Active())
+	if(m_pClient->m_Scoreboard.Active() || g_Config.m_ClWhatsMyPing == 0)
 		m_InputData[g_Config.m_ClDummy].m_PlayerFlags |= PLAYERFLAG_SCOREBOARD;
 
 	if(m_InputData[g_Config.m_ClDummy].m_PlayerFlags != PLAYERFLAG_PLAYING)

diff --git a/src/game/client/components/hud.cpp b/src/game/client/components/hud.cpp
@@ -602,12 +602,10 @@ void CHud::RenderTextInfo()
 		if(g_Config.m_ClShowFrozenText > 0)
 			TextRender()->Text(0, m_Width / 2 - TextRender()->TextWidth(0, 10, aBuf, -1, -1.0f) / 2, 12, 10, aBuf, -1.0f);
 
-		//if(m_pClient->m_PredictedChar.m_ActiveWeapon)
-
 		//str_format(aBuf, sizeof(aBuf), "%d", m_pClient->m_aClients[m_pClient->m_Snap.m_LocalClientID].m_PrevPredicted.m_FreezeEnd);
 		//str_format(aBuf, sizeof(aBuf), "%d", g_Config.m_ClWhatsMyPing);
-
 		//TextRender()->Text(0, m_Width / 2 - TextRender()->TextWidth(0, 10, aBuf, -1, -1.0f) / 2, 20, 10, aBuf, -1.0f);
+
 		if(g_Config.m_ClShowFrozenHud > 0 && !m_pClient->m_Scoreboard.Active() && !(LocalTeamID == 0 && g_Config.m_ClFrozenHudTeamOnly))
 		{
 			CTeeRenderInfo FreezeInfo;

diff --git a/src/game/client/components/players.cpp b/src/game/client/components/players.cpp
@@ -741,6 +741,17 @@ void CPlayers::OnRender()
 				CNetObj_Character PrevChar = m_pClient->m_aClients[i].m_RenderPrev;
 				CNetObj_Character CurChar = m_pClient->m_aClients[i].m_RenderCur;
 
+				if(Local && g_Config.m_ClAmIFrozen && g_Config.m_ClFreezeUpdateFix)
+				{
+					CurChar.m_Weapon = WEAPON_NINJA;
+					if (CurChar.m_Emote == EMOTE_NORMAL) {
+						CurChar.m_Emote = EMOTE_BLINK;
+					}
+				}
+				if (Local) {
+					if(m_pClient->m_Snap.m_pLocalInfo)
+						g_Config.m_ClWhatsMyPing = m_pClient->m_Snap.m_paPlayerInfos[i]->m_Latency;
+				}
 				if(p < 3)
 				{
 					RenderHook(&PrevChar, &CurChar, &m_aRenderInfo[i], i);
@@ -749,10 +760,7 @@ void CPlayers::OnRender()
 				{
 					RenderPlayer(&PrevChar, &CurChar, &m_aRenderInfo[i], i);
 				}
-				if(Local)
-					g_Config.m_ClWhatsMyPing = m_pClient->m_Snap.m_paPlayerInfos[i]->m_Latency;
 			}
-
 		}
 	}
 }

diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp
@@ -2456,9 +2456,14 @@ void CGameClient::UpdateRenderedCharacters()
 						m_aClients[i].m_RenderCur.m_Weapon = m_aClients[i].m_Predicted.m_ActiveWeapon;
 				}
 				if(pChar && pChar->m_FreezeTime > 0)
+				{
 					g_Config.m_ClAmIFrozen = 1;
+				}
 				else
+				{
 					g_Config.m_ClAmIFrozen = 0;
+					g_Config.m_ClFreezeTick = Client()->GameTick(g_Config.m_ClDummy);
+				}
 
 			}
 			else

diff --git a/src/game/variables.h b/src/game/variables.h
@@ -80,6 +80,8 @@ MACRO_CONFIG_INT(ClUnfreezeHelperLimit, tc_unfreeze_helper_limit, 45, 0, 500, CF
 
 //AAAAAAA
 MACRO_CONFIG_INT(ClAmIFrozen, EEEfrz, 0, 0, 1, CFGFLAG_CLIENT, "eeeee.")
+MACRO_CONFIG_INT(ClFreezeTick, EEEfrztck, 0, 0, 9999, CFGFLAG_CLIENT, "eeeee.")
+
 MACRO_CONFIG_INT(ClWhatsMyPing, EEEpng, 0, 0, 9999, CFGFLAG_CLIENT, "eeeee.")