From facc9078e8ef29e0dfdb9dcbcba641bb385e4742 Mon Sep 17 00:00:00 2001 From: doclic Date: Sat, 8 Mar 2025 14:34:33 +0100 Subject: [PATCH] tf2: Allow vscript to set damage for force calc This fixes https://github.com/ValveSoftware/Source-1-Games/issues/6056 --- src/game/shared/tf/tf_gamerules.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/shared/tf/tf_gamerules.cpp b/src/game/shared/tf/tf_gamerules.cpp index cce13ada8..01640475c 100644 --- a/src/game/shared/tf/tf_gamerules.cpp +++ b/src/game/shared/tf/tf_gamerules.cpp @@ -5913,7 +5913,7 @@ void CTFGameRules::RadiusDamage( const CTakeDamageInfo &info, const Vector &vecS //----------------------------------------------------------------------------- bool CTFGameRules::ApplyOnDamageModifyRules( CTakeDamageInfo &info, CBaseEntity *pVictimBaseEntity, bool bAllowDamage ) { - info.SetDamageForForceCalc( info.GetDamage() ); + if (!info.GetDamageForForceCalc()) info.SetDamageForForceCalc( info.GetDamage() ); bool bDebug = tf_debug_damage.GetBool(); CTFPlayer *pVictim = ToTFPlayer( pVictimBaseEntity );