Skip to content

Add a weapon deployment condition to the SelectLastItem() #270

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
beefy24 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add a weapon deployment condition to the SelectLastItem() #270

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed846c8
Add weapon deployment check to SelectLastItem()
beefy24 Nov 20, 2025
771249d
Change CanDeploy() check to IsUseable()
beefy24 Nov 22, 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
7 changes: 5 additions & 2 deletions dlls/weapons_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,11 @@ void CBasePlayer::SelectLastItem()
return;
}

auto weapon = m_pLastItem->GetWeaponPtr();

// don't switch if the weapon is out of ammo, otherwise it will break the animations.
if (weapon && !weapon->IsUseable()) return;

ResetAutoaim();

// FIX, this needs to queue them up and delay
Expand All @@ -224,8 +229,6 @@ void CBasePlayer::SelectLastItem()
m_pActiveItem = m_pLastItem;
m_pLastItem = pTemp;

auto weapon = m_pActiveItem->GetWeaponPtr();

if (weapon)
{
weapon->m_ForceSendAnimations = true;
Expand Down