diff options
| author | John Schoenick <[email protected]> | 2015-09-09 18:35:41 -0700 |
|---|---|---|
| committer | John Schoenick <[email protected]> | 2015-09-09 18:35:41 -0700 |
| commit | 0d8dceea4310fde5706b3ce1c70609d72a38efdf (patch) | |
| tree | c831ef32c2c801a5c5a80401736b52c7b5a528ec /mp/src/game/server/baseanimating.h | |
| parent | Updated the SDK with the latest code from the TF and HL2 branches. (diff) | |
| download | source-sdk-2013-master.tar.xz source-sdk-2013-master.zip | |
Diffstat (limited to 'mp/src/game/server/baseanimating.h')
| -rw-r--r-- | mp/src/game/server/baseanimating.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mp/src/game/server/baseanimating.h b/mp/src/game/server/baseanimating.h index 75300e8e..0550683e 100644 --- a/mp/src/game/server/baseanimating.h +++ b/mp/src/game/server/baseanimating.h @@ -108,6 +108,7 @@ public: void ResetEventIndexes ( void ); int SelectWeightedSequence ( Activity activity ); int SelectWeightedSequence ( Activity activity, int curSequence ); + int SelectWeightedSequenceFromModifiers( Activity activity, CUtlSymbol *pActivityModifiers, int iModifierCount ); int SelectHeaviestSequence ( Activity activity ); int LookupActivity( const char *label ); int LookupSequence ( const char *label ); @@ -436,10 +437,14 @@ inline CStudioHdr *CBaseAnimating::GetModelPtr( void ) return NULL; #ifdef _DEBUG - // GetModelPtr() is often called before OnNewModel() so go ahead and set it up first chance. - static IDataCacheSection *pModelCache = datacache->FindSection( "ModelData" ); - AssertOnce( pModelCache->IsFrameLocking() ); + if ( !HushAsserts() ) + { + // GetModelPtr() is often called before OnNewModel() so go ahead and set it up first chance. + static IDataCacheSection *pModelCache = datacache->FindSection( "ModelData" ); + AssertOnce( pModelCache->IsFrameLocking() ); + } #endif + if ( !m_pStudioHdr && GetModel() ) { LockStudioHdr(); |