sfx shadowvar cleanup

Engine/source/sfx/sfxDevice.cpp

@@ -168,9 +168,9 @@ void SFXDevice::_removeBuffer( SFXBuffer* buffer )
    BufferIterator iter = find( mBuffers.begin(), mBuffers.end(), buffer );
    if( iter != mBuffers.end() )
    {
-      SFXBuffer* buffer = *iter;
+      SFXBuffer* curBuf = *iter;
 
-      mStatNumBufferBytes -= buffer->getMemoryUsed();
+      mStatNumBufferBytes -= curBuf->getMemoryUsed();
       mStatNumBuffers --;
       
       mBuffers.erase( iter );

Engine/source/sfx/sfxSoundscape.cpp

@@ -174,18 +174,18 @@ void SFXSoundscapeManager::update()
          // Activate SFXStates on the ambience.  For state slots that
          // have changed, deactivate states that we have already activated.
          
-         for( U32 i = 0; i < SFXAmbience::MaxStates; ++ i )
+         for( U32 ambState = 0; ambState < SFXAmbience::MaxStates; ++ambState)
          {
-            SFXState* state = ambience->getState( i );
-            if( soundscape->mStates[ i ] != state )
+            SFXState* state = ambience->getState(ambState);
+            if( soundscape->mStates[ambState] != state )
             {
-               if( soundscape->mStates[ i ] )
-                  soundscape->mStates[ i ]->deactivate();
+               if( soundscape->mStates[ambState] )
+                  soundscape->mStates[ambState]->deactivate();
 
                if( state )
                   state->activate();
                   
-               soundscape->mStates[ i ] = state;
+               soundscape->mStates[ambState] = state;
             }
          }
          

Engine/source/sfx/sfxSystem.cpp

@@ -674,9 +674,9 @@ void SFXSystem::_onRemoveSource( SFXSource* source )
 {
    // Check if it was a play once source.
    
-   Vector< SFXSource* >::iterator iter = find( mPlayOnceSources.begin(), mPlayOnceSources.end(), source );
-   if ( iter != mPlayOnceSources.end() )
-      mPlayOnceSources.erase_fast( iter );
+   Vector< SFXSource* >::iterator sourceIter = find( mPlayOnceSources.begin(), mPlayOnceSources.end(), source );
+   if (sourceIter != mPlayOnceSources.end() )
+      mPlayOnceSources.erase_fast(sourceIter);
 
    // Update the stats.
    
@@ -684,9 +684,9 @@ void SFXSystem::_onRemoveSource( SFXSource* source )
    
    if( dynamic_cast< SFXSound* >( source ) )
    {
-      SFXSoundVector::iterator iter = find( mSounds.begin(), mSounds.end(), static_cast< SFXSound* >( source ) );
-      if( iter != mSounds.end() )
-         mSounds.erase_fast( iter );
+      SFXSoundVector::iterator vectorIter = find( mSounds.begin(), mSounds.end(), static_cast< SFXSound* >( source ) );
+      if(vectorIter != mSounds.end() )
+         mSounds.erase_fast(vectorIter);
          
       mStatNumSounds = mSounds.size();
    }