If we teleported or PostThink decided to modify viewoffset

Let it do it because interpolation will be reset
XutaxKamay · Sep 14, 2024 · 8596379 · 8596379
1 parent 72aea29
commit 8596379
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 0 deletions.
diff --git a/game/client/prediction.cpp b/game/client/prediction.cpp
@@ -866,6 +866,9 @@ void CPrediction::StartInterpolatingPlayer( C_BasePlayer *player )
 
 	player->SetLocalOrigin( vecNewLocalOrigin );
 	player->SetViewOffset( vecNewViewOffset );
+
+	InterpolationContexts[BEFORE_POST_THINK].m_vecLocalOrigin = player->GetLocalOrigin();
+	InterpolationContexts[BEFORE_POST_THINK].m_vecViewOffset  = player->GetViewOffset();
 #endif
 }
 
@@ -874,6 +877,13 @@ void CPrediction::FinishInterpolatingPlayer( C_BasePlayer* player )
 #if !defined( NO_ENTITY_PREDICTION )
 	VPROF( "CPrediction::FinishInterpolatingPlayer" );
 
+	// We probably teleported or something.
+	if ( InterpolationContexts[BEFORE_POST_THINK].m_vecLocalOrigin != player->GetLocalOrigin()
+		 || InterpolationContexts[BEFORE_POST_THINK].m_vecViewOffset != player->GetViewOffset() )
+	{
+		return;
+	}
+
 	player->SetLocalOrigin( InterpolationContexts[AFTER_MOVEMENT].m_vecLocalOrigin );
 	player->SetViewOffset( InterpolationContexts[AFTER_MOVEMENT].m_vecViewOffset );
 #endif

diff --git a/game/client/prediction.h b/game/client/prediction.h
@@ -187,6 +187,7 @@ class CPrediction : public IPrediction
 	enum INTERPOLATION_CONTEXT
 	{
 		BEFORE_MOVEMENT,
+		BEFORE_POST_THINK,
 		AFTER_MOVEMENT,
 		INTERPOLATION_CONTEXT_MAX
 	};

diff --git a/game/server/player_command.cpp b/game/server/player_command.cpp
@@ -319,12 +319,22 @@ void CPlayerMove::StartInterpolatingPlayer( CBasePlayer *player )
 
 	player->SetLocalOrigin( vecNewLocalOrigin );
 	player->SetViewOffset( vecNewViewOffset );
+
+	InterpolationContexts[BEFORE_POST_THINK].m_vecLocalOrigin = player->GetLocalOrigin();
+	InterpolationContexts[BEFORE_POST_THINK].m_vecViewOffset  = player->GetViewOffset();
 }
 
 void CPlayerMove::FinishInterpolatingPlayer( CBasePlayer* player )
 {
 	VPROF( "CPlayerMove::FinishInterpolatingPlayer" );
 
+	// We probably teleported or something.
+	if ( InterpolationContexts[BEFORE_POST_THINK].m_vecLocalOrigin != player->GetLocalOrigin()
+		 || InterpolationContexts[BEFORE_POST_THINK].m_vecViewOffset != player->GetViewOffset() )
+	{
+		return;
+	}
+
 	player->SetLocalOrigin( InterpolationContexts[AFTER_MOVEMENT].m_vecLocalOrigin );
 	player->SetViewOffset( InterpolationContexts[AFTER_MOVEMENT].m_vecViewOffset );
 }

diff --git a/game/server/player_command.h b/game/server/player_command.h
@@ -59,6 +59,7 @@ class CPlayerMove
 	enum INTERPOLATION_CONTEXT
 	{
 		BEFORE_MOVEMENT,
+		BEFORE_POST_THINK,
 		AFTER_MOVEMENT,
 		INTERPOLATION_CONTEXT_MAX
 	};