Skip to content

[TF2] Fix high melee firing speed not working correctly #1574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[TF2] Fix high melee firing speed not working correctly #1574

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
941763c
Fix https://github.com/ValveSoftware/Source-1-Games/issues/6223 - Too…
naydef Oct 24, 2025
5873c9e
Code style
naydef Oct 24, 2025
caaf8bf
Fixing style for my if and the precending if
naydef Oct 24, 2025
3d1833c
ficool's suggestion
naydef Oct 26, 2025
2b6d172
Style + comment
naydef Oct 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/game/shared/tf/tf_weaponbase_melee.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,12 @@ void CTFWeaponBaseMelee::PlaySwingSound( void )
//-----------------------------------------------------------------------------
void CTFWeaponBaseMelee::Swing( CTFPlayer *pPlayer )
{
// A previous smack could be pending, so do the smack before we forget about it
if ( m_flSmackTime >= m_flNextPrimaryAttack )
{
Smack();
}

CalcIsAttackCritical();

#ifdef GAME_DLL
Expand Down Expand Up @@ -308,7 +314,7 @@ void CTFWeaponBaseMelee::Swing( CTFPlayer *pPlayer )
m_potentialVictimVector.RemoveAll();
const float looseSwingRange = 1.2f * GetSwingRange();

for( int i=0; i<enemyVector.Count(); ++i )
for ( int i=0; i<enemyVector.Count(); ++i )
{
Vector toVictim = enemyVector[i]->WorldSpaceCenter() - pPlayer->Weapon_ShootPosition();

Expand Down