Skip to content

Fix some weapons still drawing arm model when holstered #495

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

Fix some weapons still drawing arm model when holstered #495

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
13 changes: 8 additions & 5 deletions sp/src/game/shared/baseviewmodel_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,13 +367,16 @@ void CBaseViewModel::SetWeaponModel( const char *modelname, CBaseCombatWeapon *w
#endif

#ifdef MAPBASE
// If our owning weapon doesn't support hands, disable the hands viewmodel(s)
bool bSupportsHands = weapon != NULL ? weapon->UsesHands() : false;
for (CBaseEntity *pChild = FirstMoveChild(); pChild != NULL; pChild = pChild->NextMovePeer())
if ( !( GetEffects() & EF_NODRAW ) )
{
if (pChild->GetClassname()[0] == 'h')
// If our owning weapon doesn't support hands, disable the hands viewmodel(s)
bool bSupportsHands = weapon != NULL ? weapon->UsesHands() : false;
for (CBaseEntity *pChild = FirstMoveChild(); pChild != NULL; pChild = pChild->NextMovePeer())
{
bSupportsHands ? pChild->RemoveEffects( EF_NODRAW ) : pChild->AddEffects( EF_NODRAW );
if (pChild->GetClassname()[0] == 'h')
{
bSupportsHands ? pChild->RemoveEffects( EF_NODRAW ) : pChild->AddEffects( EF_NODRAW );
}
}
}
#endif
Expand Down