mirror of
https://github.com/ValveSoftware/source-sdk-2013.git
synced 2025-04-10 12:09:03 +00:00
Merge b7248bbac6
into 0565403b15
This commit is contained in:
commit
8176e8443f
3 changed files with 3 additions and 3 deletions
|
@ -2434,7 +2434,7 @@ FORCEINLINE Vector CParticleCollection::GetControlPointVelocityAtCurrentTime( in
|
|||
|
||||
FORCEINLINE bool CParticleCollection::IsValid( void ) const
|
||||
{
|
||||
return ( m_pDef != NULL && m_pDef->GetMaterial() );
|
||||
return ( m_pDef != CUtlReference<CParticleSystemDefinition>(NULL) && m_pDef->GetMaterial() );
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -244,7 +244,7 @@ void CUtlSortVector<T, LessFunc, BaseVector>::QuickSort( LessFunc& less, int nLo
|
|||
ctx.m_pLessContext = m_pLessContext;
|
||||
ctx.m_pLessFunc = &less;
|
||||
|
||||
qsort_s( Base(), Count(), sizeof(T), (QSortCompareFunc_t)&CUtlSortVector<T, LessFunc>::CompareHelper, &ctx );
|
||||
qsort_s( this->Base(), this->Count(), sizeof(T), (QSortCompareFunc_t)&CUtlSortVector<T, LessFunc>::CompareHelper, &ctx );
|
||||
}
|
||||
#else
|
||||
typedef int (__cdecl *QSortCompareFunc_t)( const void *, const void *);
|
||||
|
|
|
@ -105,7 +105,7 @@ public:
|
|||
|
||||
inline bool HasElement( const char* pStr ) const
|
||||
{
|
||||
return Find( pStr ) != UTL_INVAL_SYMBOL;
|
||||
return Find( pStr ) != CUtlSymbol(UTL_INVAL_SYMBOL);
|
||||
}
|
||||
|
||||
// Remove all symbols in the table.
|
||||
|
|
Loading…
Reference in a new issue