Skip to content
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

Prevent switching to grenades in a few more places #63

Merged
merged 2 commits into from
Jun 3, 2016
Merged

Prevent switching to grenades in a few more places #63

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57745fa
Do not select grenades when spawning without guns
TomyLobo May 28, 2016
8e30feb
Do not select grenades when picking up a second grenade while not car…
TomyLobo May 28, 2016
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
Prev Previous commit
Do not select grenades when picking up a second grenade while not car… 
…rying any guns
  • Loading branch information
@TomyLobo
TomyLobo committed Jun 3, 2016
commit 8e30febfe80e99b260278189b00272444115cb99
2 changes: 1 addition & 1 deletion mp/src/game/shared/sdk/weapon_sdkbase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1621,7 +1621,7 @@ void CWeaponSDKBase::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYP
if ( HasPrimaryAmmo() )
return;

if (GetWeaponID() == SDK_WEAPON_GRENADE && pPlayer->GetActiveSDKWeapon() && pPlayer->GetActiveSDKWeapon()->GetWeaponID() != SDK_WEAPON_BRAWL)
if (GetWeaponID() == SDK_WEAPON_GRENADE && pPlayer->GetActiveSDKWeapon())
{
// We can throw it without switching to it and it'll appear on the HUD. Don't switch.
}
Expand Down