Skip to content

fix: Properly Drop disguise botkiller and non-disguise weapons #1945

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
seanmcgeehan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Properly Drop disguise botkiller and non-disguise weapons #1945

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions src/game/shared/tf/tf_weaponbase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,11 +1129,23 @@ void CTFWeaponBase::Drop( const Vector &vecVelocity )
// RemoveDisguiseWearables sweeps it up at full disguise removal which prevents the leak.
if ( m_bDisguiseWeapon && m_hExtraWearableViewModel )
{
m_hExtraWearableViewModel->RemoveFrom( GetOwnerEntity() );
m_hExtraWearableViewModel = NULL;
// the existance of a viewmodel implies it should go away on weapon switch
//for disguised spies.
RemoveExtraWearables();
}
#endif

//Drop is currently only used for disguise weapons,
// but if we ever use it for non-disguise weapons
// we need to make sure to remove the extra wearables here
// so they don't get orphaned in the world.
// Disguise weapons are handled via cap in determineDisguiseWearables
if ( !m_bDisguiseWeapon )
{
RemoveExtraWearables();
}


BaseClass::Drop( vecVelocity );

ReapplyProvision();
Expand Down