fix passtime flamethrower

mastercomfig · Oct 6, 2020 · 4e90c22 · 4e90c22
1 parent 0c17fa0
commit 4e90c22
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/game/shared/tf/tf_weapon_flamethrower.cpp b/game/shared/tf/tf_weapon_flamethrower.cpp
@@ -609,13 +609,6 @@ void CTFFlameThrower::PrimaryAttack()
 	// Move other players back to history positions based on local player's lag
 	lagcompensation->StartLagCompensation( pOwner, pOwner->GetCurrentCommand() );
 
-	// PASSTIME custom lag compensation for the ball; see also tf_fx_shared.cpp
-	// it would be better if all entities could opt-in to this, or a way for lagcompensation to handle non-players automatically
-	if ( g_pPasstimeLogic && g_pPasstimeLogic->GetBall() )
-	{
-		g_pPasstimeLogic->GetBall()->StartLagCompensation( pOwner, pOwner->GetCurrentCommand() );
-	}
-
 #endif
 #ifdef CLIENT_DLL
 	C_CTF_GameStats.Event_PlayerFiredWeapon( pOwner, IsCurrentAttackACrit() );
@@ -716,13 +709,6 @@ void CTFFlameThrower::PrimaryAttack()
 
 #if !defined (CLIENT_DLL)
 	lagcompensation->FinishLagCompensation( pOwner );
-
-	// PASSTIME custom lag compensation for the ball; see also tf_fx_shared.cpp
-	// it would be better if all entities could opt-in to this, or a way for lagcompensation to handle non-players automatically
-	if ( g_pPasstimeLogic && g_pPasstimeLogic->GetBall() )
-	{
-		g_pPasstimeLogic->GetBall()->FinishLagCompensation( pOwner );
-	}
 #endif
 }
 

diff --git a/game/shared/tf/tf_weaponbase.cpp b/game/shared/tf/tf_weaponbase.cpp
@@ -31,6 +31,7 @@
 #include "tf_gamerules.h"
 #include "tf_gamestats.h"
 #include "ilagcompensationmanager.h"
+#include "tf_passtime_logic.h"
 #include "collisionutils.h"
 #include "tf_team.h"
 #include "tf_obj.h"
@@ -5464,6 +5465,13 @@ bool CTFWeaponBase::DeflectProjectiles()
 
 	lagcompensation->StartLagCompensation( pOwner, pOwner->GetCurrentCommand() );
 
+	// PASSTIME custom lag compensation for the ball; see also tf_fx_shared.cpp
+	// it would be better if all entities could opt-in to this, or a way for lagcompensation to handle non-players automatically
+	if ( g_pPasstimeLogic && g_pPasstimeLogic->GetBall() )
+	{
+		g_pPasstimeLogic->GetBall()->StartLagCompensation( pOwner, pOwner->GetCurrentCommand() );
+	}
+
 	Vector vecEye = pOwner->EyePosition();
 	Vector vecForward, vecRight, vecUp;
 	AngleVectors( pOwner->EyeAngles(), &vecForward, &vecRight, &vecUp );
@@ -5530,6 +5538,13 @@ bool CTFWeaponBase::DeflectProjectiles()
 
 	lagcompensation->FinishLagCompensation( pOwner );
 
+	// PASSTIME custom lag compensation for the ball; see also tf_fx_shared.cpp
+	// it would be better if all entities could opt-in to this, or a way for lagcompensation to handle non-players automatically
+	if ( g_pPasstimeLogic && g_pPasstimeLogic->GetBall() )
+	{
+		g_pPasstimeLogic->GetBall()->FinishLagCompensation( pOwner );
+	}
+
 	return true;
 }