From 0d8dceea4310fde5706b3ce1c70609d72a38efdf Mon Sep 17 00:00:00 2001 From: John Schoenick Date: Wed, 9 Sep 2015 18:35:41 -0700 Subject: Updated the SDK with the latest code from the TF and HL2 branches. --- mp/src/game/shared/base_playeranimstate.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'mp/src/game/shared/base_playeranimstate.cpp') diff --git a/mp/src/game/shared/base_playeranimstate.cpp b/mp/src/game/shared/base_playeranimstate.cpp index d90655ac..768e4f17 100644 --- a/mp/src/game/shared/base_playeranimstate.cpp +++ b/mp/src/game/shared/base_playeranimstate.cpp @@ -269,7 +269,7 @@ void CBasePlayerAnimState::ComputeMainSequence() int animDesired = SelectWeightedSequence( TranslateActivity(idealActivity) ); #if !defined( HL1_CLIENT_DLL ) && !defined ( HL1_DLL ) - if ( pPlayer->GetSequenceActivity( pPlayer->GetSequence() ) == pPlayer->GetSequenceActivity( animDesired ) ) + if ( !ShouldResetMainSequence( pPlayer->GetSequence(), animDesired ) ) return; #endif @@ -289,8 +289,13 @@ void CBasePlayerAnimState::ComputeMainSequence() #endif } +bool CBasePlayerAnimState::ShouldResetMainSequence( int iCurrentSequence, int iNewSequence ) +{ + if ( !GetOuter() ) + return false; - + return GetOuter()->GetSequenceActivity( iCurrentSequence ) != GetOuter()->GetSequenceActivity( iNewSequence ); +} void CBasePlayerAnimState::UpdateAimSequenceLayers( -- cgit v1.2.3