remove 1 out of 2 janky config vars

sjrc6 · Aug 30, 2024 · f92f9d7 · f92f9d7
1 parent ce0893d
commit f92f9d7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp
@@ -2935,7 +2935,6 @@ void CGameClient::UpdateRenderedCharacters()
 		vec2 Pos = UnpredPos;
 
 		CCharacter *pChar = m_PredictedWorld.GetCharacterById(i);
-
 		// TODO: @Tater remove this garbage
 		if(i == m_Snap.m_LocalClientId)
 		{
@@ -2946,7 +2945,6 @@ void CGameClient::UpdateRenderedCharacters()
 			else
 			{
 				g_Config.m_ClAmIFrozen = 0;
-				g_Config.m_ClFreezeTick = Client()->GameTick(g_Config.m_ClDummy);
 			}
 		}
 
@@ -3121,14 +3119,14 @@ vec2 CGameClient::GetFreezePos(int ClientId)
 		float MixAmount = 0.0f;
 		int SmoothTick;
 		float SmoothIntra;
-		int TicksFrozen = Client()->GameTick(g_Config.m_ClDummy) - g_Config.m_ClFreezeTick;
+		int TicksFrozen = 0;
 
-		if(pChar && g_Config.m_ClAdjustRemovedDelay && ClientId == m_Snap.m_LocalClientId)
+		if(pChar && ClientId == m_Snap.m_LocalClientId)
 		{
 			TicksFrozen = pChar->m_FreezeAccumulation;
 		}
 
-		if(g_Config.m_ClAmIFrozen && g_Config.m_ClRemoveAnti)
+		if(g_Config.m_ClRemoveAnti && pChar->m_FreezeTime > 0)
 		{
 			MixAmount = mix(0.0f, 1.0f, 1.0f - (float)std::min(TicksFrozen, g_Config.m_ClUnfreezeLagDelayTicks) / (float)g_Config.m_ClUnfreezeLagDelayTicks);
 		}

diff --git a/src/game/tater_variables.h b/src/game/tater_variables.h
@@ -27,7 +27,7 @@ MACRO_CONFIG_INT(ClLimitMouseToScreen, tc_limit_mouse_to_screen, 0, 0, 2, CFGFLA
 
 
 //Anti Latency Tools
-MACRO_CONFIG_INT(ClFreezeUpdateFix, tc_freeze_update_fix, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "(WIP) Will change your skin faster when you enter freeze. ")
+MACRO_CONFIG_INT(ClFreezeUpdateFix, tc_freeze_update_fix, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Will change your skin faster when you enter freeze. ")
 MACRO_CONFIG_INT(ClRemoveAnti, tc_remove_anti, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Removes some amount of antiping & player prediction in freeze")
 MACRO_CONFIG_INT(ClUnfreezeLagTicks, tc_remove_anti_ticks, 5, 0, 20, CFGFLAG_CLIENT | CFGFLAG_SAVE, "The biggest amount of prediction ticks that are removed")
 MACRO_CONFIG_INT(ClUnfreezeLagDelayTicks, tc_remove_anti_delay_ticks, 100, 0, 200, CFGFLAG_CLIENT | CFGFLAG_SAVE, "How many ticks it takes to remove the maximum prediction after being frozen")
@@ -55,7 +55,7 @@ MACRO_CONFIG_INT(ClShowSkinName, tc_skin_name, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG
 
 //MACRO_CONFIG_INT(ClFreeGhost, tc_freeghost, 0, 0, 1, CFGFLAG_CLIENT , "")
 
-MACRO_CONFIG_INT(ClSmoothPredictionMargin, tc_prediction_margin_smooth, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Makes prediction margin transition smooth (reverts a ddnet change)")
+MACRO_CONFIG_INT(ClSmoothPredictionMargin, tc_prediction_margin_smooth, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Makes prediction margin transition smooth, causes worse jitter adjustment (reverts a ddnet change)")
 
 MACRO_CONFIG_INT(ClFastInput, tc_fast_input, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Uses input for prediction up to 20ms faster")
 
@@ -129,5 +129,4 @@ MACRO_CONFIG_INT(ClRainbowOthers, tc_rainbow_others, 0, 0, 1, CFGFLAG_CLIENT | C
 MACRO_CONFIG_INT(ClRainbowMode, tc_rainbow_mode, 1, 1, 4, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Rainbow mode (1: rainbow, 2: pulse, 3: darkness)")
 
 //AAAAAAA
-MACRO_CONFIG_INT(ClAmIFrozen, EEEfrz, 0, 0, 1, CFGFLAG_CLIENT, "")
-MACRO_CONFIG_INT(ClFreezeTick, EEEfrztk, 0, 0, 9999, CFGFLAG_CLIENT, "")
+MACRO_CONFIG_INT(ClAmIFrozen, EEEfrz, 0, 0, 1, CFGFLAG_CLIENT, "")