Skip to content

Commit e0b7671

Browse files
committed
update caber taunt implementation to mirror PR ValveSoftware#1457
1 parent c5f3ff2 commit e0b7671

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/game/server/tf/tf_player.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20526,7 +20526,7 @@ void CTFPlayer::DoTauntAttack( void )
2052620526
pTarget->ApplyPunchImpulseX(RandomInt(2, 5));
2052720527

2052820528
AngleVectors(QAngle(-45, m_angEyeAngles[YAW], 0), &vecForward);
20529-
pTarget->TakeDamage(CTakeDamageInfo(this, this, GetActiveTFWeapon(), vecForward * 8500, WorldSpaceCenter(), TF_STICKBOMB_KILLTAUNT_DAMAGE, DMG_CLUB));
20529+
pTarget->TakeDamage(CTakeDamageInfo(this, this, GetActiveTFWeapon(), vecForward * 8500, WorldSpaceCenter(), TF_STICKBOMB_KILLTAUNT_DAMAGE, DMG_CLUB | DMG_MELEE));
2053020530
}
2053120531
}
2053220532
}

src/game/shared/tf/tf_weapon_bottle.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class CTFStickBomb : public CTFBreakableMelee
113113
int GetDetonated( void ) { return m_iDetonated; }
114114

115115
#ifdef BDSBASE
116-
virtual void Detonate(bool bTaunting = false);
116+
void Detonate(bool bTaunting = false);
117117
#endif
118118

119119
#if defined(QUIVER_DLL)

0 commit comments

Comments
 (0)