[particles] Use correct return type for particle systems count

particles/particles.cpp

@@ -131,14 +131,14 @@ class CParticleSystemDictionary
 
 	CParticleSystemDefinition* AddParticleSystem( CDmxElement *pParticleSystem );
 	intp Count() const;
-	intp NameCount() const;
+	UtlSymId_t NameCount() const;
 	CParticleSystemDefinition* GetParticleSystem( intp i );
 	ParticleSystemHandle_t FindParticleSystemHandle( const char *pName );
 	CParticleSystemDefinition* FindParticleSystem( ParticleSystemHandle_t h );
 	CParticleSystemDefinition* FindParticleSystem( const char *pName );
 	CParticleSystemDefinition* FindParticleSystem( const DmObjectId_t &id );
 
-	CParticleSystemDefinition* operator[]( intp idx )
+	CParticleSystemDefinition* operator[]( UtlSymId_t idx )
 	{
 		return m_ParticleNameMap[ idx ];
 	}
@@ -229,7 +229,7 @@ CParticleSystemDefinition* CParticleSystemDictionary::AddParticleSystem( CDmxEle
 	return pDef;
 }
 
-intp CParticleSystemDictionary::NameCount() const
+UtlSymId_t CParticleSystemDictionary::NameCount() const
 {
 	return m_ParticleNameMap.GetNumStrings();
 }
@@ -1021,7 +1021,7 @@ void CParticleCollection::Init( CParticleSystemDefinition *pDef, float flDelay,
 	}
 	else
 	{
-		m_nRandomSeed = (intp)this;
+		m_nRandomSeed = static_cast<int>(reinterpret_cast<intp>(this));
 #ifndef _DEBUG
 		// dimhotepus: ms -> mcs to not overflow in 49.7 days.
 		m_nRandomSeed += static_cast<int>((Plat_USTime() / 1000) % std::numeric_limits<int>::max());
@@ -3034,8 +3034,8 @@ void CParticleSystemMgr::UncacheAllParticleSystems()
 		m_pParticleSystemDictionary->GetParticleSystem( i )->Uncache();
 	}
 
-	nCount = m_pParticleSystemDictionary->NameCount();
-	for ( ParticleSystemHandle_t h = 0; h < nCount; ++h )
+	UtlSymId_t nNameCount  = m_pParticleSystemDictionary->NameCount();
+	for ( ParticleSystemHandle_t h = 0; h < nNameCount; ++h )
 	{
 		m_pParticleSystemDictionary->FindParticleSystem( h )->Uncache();
 	}
@@ -3436,7 +3436,7 @@ const char *CParticleSystemMgr::GetParticleSystemNameFromIndex( ParticleSystemHa
 	return pDef ? pDef->GetName() : "Unknown";
 }
 
-intp CParticleSystemMgr::GetParticleSystemCount( void )
+UtlSymId_t CParticleSystemMgr::GetParticleSystemCount( void )
 {
 	return m_pParticleSystemDictionary->NameCount();
 }
@@ -3718,7 +3718,7 @@ void CParticleSystemMgr::DumpProfileInformation( void )
 	FileHandle_t fh = g_pFullFileSystem->Open( "particle_profile.csv", "w" );
 	g_pFullFileSystem->FPrintf( fh, "numframes,%d\n", m_nNumFramesMeasured );
 	g_pFullFileSystem->FPrintf( fh, "name, total time, max time, max particles, allocated particles\n");
-	for( int i=0; i < m_pParticleSystemDictionary->NameCount(); i++ )
+	for( UtlSymId_t i=0; i < m_pParticleSystemDictionary->NameCount(); i++ )
 	{
 		CParticleSystemDefinition *p = ( *m_pParticleSystemDictionary )[ i ];
 		if ( p->m_nMaximumActiveParticles )
@@ -3747,7 +3747,7 @@ void CParticleSystemMgr::CommitProfileInformation( bool bCommit )
 	{
 		if ( bCommit )
 			m_nNumFramesMeasured++;
-		for( int i=0; i < m_pParticleSystemDictionary->NameCount(); i++ )
+		for( UtlSymId_t i=0; i < m_pParticleSystemDictionary->NameCount(); i++ )
 		{
 			CParticleSystemDefinition *p = ( *m_pParticleSystemDictionary )[ i ];
 			if ( bCommit )

public/particles/particles.h

@@ -296,7 +296,7 @@ class IParticleSystemQuery : public IAppSystem
 // separate particle system .libs
 //
 //-----------------------------------------------------------------------------
-typedef intp ParticleSystemHandle_t;
+typedef UtlSymId_t ParticleSystemHandle_t;
 
 class CParticleSystemMgr
 {
@@ -344,7 +344,7 @@ class CParticleSystemMgr
 	const char *GetParticleSystemNameFromIndex( ParticleSystemHandle_t iIndex );
 
 	// Return the number of particle systems in our dictionary
-	intp GetParticleSystemCount( void );
+	UtlSymId_t GetParticleSystemCount( void );
 
 	// call to get available particle operator definitions
 	// NOTE: FUNCTION_CHILDREN will return a faked one, for ease of writing the editor