unify(particlesys): Merge minor refactors in ParticleSystem (TheSuperHackers#2153)

Author: xezon

Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp

@@ -1857,11 +1857,11 @@ const ParticleInfo *ParticleSystem::generateParticleInfo( Int particleNum, Int p
 	if( m_accumulatedSizeBonus )
 		m_accumulatedSizeBonus = min( m_accumulatedSizeBonus, (float)MAX_SIZE_BONUS );
 
-	int i=0;
-	for( ; i<MAX_KEYFRAMES; i++ )
+	for( int i=0; i<MAX_KEYFRAMES; i++ )
 	{
 		info.m_alphaKey[i].value = m_alphaKey[i].var.getValue();
 		info.m_alphaKey[i].frame = m_alphaKey[i].frame;
+		info.m_colorKey[i] = m_colorKey[i];
 	}
 
 /*
@@ -1870,11 +1870,6 @@ const ParticleInfo *ParticleSystem::generateParticleInfo( Int particleNum, Int p
 	info.m_color.blue = m_color.blue.getValue();
 */
 
-	for( i=0; i<MAX_KEYFRAMES; i++ )
-	{
-		info.m_colorKey[i] = m_colorKey[i];
-	}
-
 	info.m_colorScale = m_colorScale.getValue();
 #ifdef ALLOW_TEMPORARIES
 	Vector3 pos = m_transform * Vector3(0, 0, 0);

GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h

@@ -178,7 +178,7 @@ class Particle : public MemoryPoolObject,
 
 	Particle( ParticleSystem *system, const ParticleInfo *data );
 
-	inline Bool update( void );												///< update this particle's behavior - return false if dead
+	Bool update( void );												///< update this particle's behavior - return false if dead
 	void doWindMotion( void );									///< do wind motion (if present) from particle system
 
 	void applyForce( const Coord3D *force );		///< add the given acceleration
@@ -190,7 +190,7 @@ class Particle : public MemoryPoolObject,
 	const RGBColor *getColor( void ) { return &m_color; }
 	void setColor( RGBColor *color ) { m_color = *color; }
 
-	inline Bool isInvisible( void );										///< return true if this particle is invisible
+	Bool isInvisible( void );										///< return true if this particle is invisible
 	Bool isCulled (void) {return m_isCulled;}				///< return true if the particle falls off the edge of the screen
 	void setIsCulled (Bool enable) { m_isCulled = enable;}		///< set particle to not visible because it's outside view frustum
 

GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp

@@ -492,7 +492,9 @@ Bool Particle::update( void )
 
 
 	// reset the acceleration for accumulation next frame
-	m_accel.z=m_accel.y=m_accel.x= 0.0f;
+	m_accel.x = 0.0f;
+	m_accel.y = 0.0f;
+	m_accel.z = 0.0f;
 
 	// monitor lifetime
 	if (m_lifetimeLeft && --m_lifetimeLeft == 0)