Merge pull request #1984 from FooBarbarians/fix-1912

Reordering initialization methods #1912

Engine/source/sfx/openal/sfxALBuffer.cpp

@@ -54,9 +54,9 @@ SFXALBuffer::SFXALBuffer(  const OPENALFNTABLE &oalft,
                            SFXDescription* description,
                            bool useHardware )
    :  Parent( stream, description ),
-      mOpenAL( oalft ),
+      mIs3d( description->mIs3D ),
       mUseHardware( useHardware ),
-      mIs3d( description->mIs3D )
+      mOpenAL( oalft )
 {
    // Set up device buffers.
 

Engine/source/sfx/openal/sfxALDevice.cpp

@@ -34,8 +34,8 @@ SFXALDevice::SFXALDevice(  SFXProvider *provider,
                            S32 maxBuffers )
    :  Parent( name, provider, useHardware, maxBuffers ),
       mOpenAL( openal ), 
-      mDevice( NULL ), 
       mContext( NULL ),
+      mDevice( NULL ), 
       mRolloffFactor( 1.0f )
 {
    mMaxBuffers = getMax( maxBuffers, 8 );

Engine/source/sfx/sfxAmbience.cpp

@@ -83,10 +83,10 @@ SFXAmbience::ChangeSignal SFXAmbience::smChangeSignal;
 //-----------------------------------------------------------------------------
 
 SFXAmbience::SFXAmbience()
-   : mEnvironment( NULL ),
-     mSoundTrack( NULL ),
+   : mDopplerFactor( 0.5f ),
      mRolloffFactor( 1.f ),
-     mDopplerFactor( 0.5f )
+     mSoundTrack( NULL ),
+     mEnvironment( NULL )
 {
    dMemset( mState, 0, sizeof( mState ) );
 }

Engine/source/sfx/sfxDescription.cpp

@@ -134,8 +134,8 @@ SFXDescription::SFXDescription()
       mFadeLoops( false ),
       mStreamPacketSize( SFXInternal::SFXAsyncStream::DEFAULT_STREAM_PACKET_LENGTH ),
       mStreamReadAhead( SFXInternal::SFXAsyncStream::DEFAULT_STREAM_LOOKAHEAD ),
-      mPriority( 1.0f ),
       mScatterDistance( 0.f, 0.f, 0.f ),
+      mPriority( 1.0f ),
       mSourceGroup( NULL )
 {
    dMemset( mParameters, 0, sizeof( mParameters ) );
@@ -164,11 +164,11 @@ SFXDescription::SFXDescription( const SFXDescription& desc )
       mFadeOutEase( desc.mFadeOutEase ),
       mFadeLoops( desc.mFadeLoops ),
       mStreamPacketSize( desc.mStreamPacketSize ),
-      mStreamReadAhead( desc.mStreamReadAhead ),
       mUseReverb( desc.mUseReverb ),
+      mStreamReadAhead( desc.mStreamReadAhead ),
       mReverb( desc.mReverb ),
-      mPriority( desc.mPriority ),
-      mScatterDistance( desc.mScatterDistance )
+      mScatterDistance( desc.mScatterDistance ),
+      mPriority( desc.mPriority )
 {
    for( U32 i = 0; i < MaxNumParameters; ++ i )
       mParameters[ i ] = desc.mParameters[ i ];

Engine/source/sfx/sfxModifier.cpp

@@ -60,8 +60,8 @@ bool SFXOneShotModifier::update()
 SFXRangeModifier::SFXRangeModifier( SFXSource* source, F32 startTime, F32 endTime, bool removeWhenDone )
    : Parent( source, removeWhenDone ),
      mStartTime( startTime ),
-     mEndTime( endTime ),
-     mIsActive( false )
+     mIsActive( false ),
+     mEndTime( endTime )
 {
 }
 

Engine/source/sfx/sfxPlayList.cpp

@@ -217,8 +217,8 @@ EndImplementEnumType;
 SFXPlayList::SFXPlayList()
    : mRandomMode( RANDOM_NotRandom ),
      mLoopMode( LOOP_All ),
-     mNumSlotsToPlay( NUM_SLOTS ),
-     mTrace( false )
+     mTrace( false ),
+     mNumSlotsToPlay( NUM_SLOTS )
 {
 }
 

Engine/source/sfx/sfxProvider.cpp

@@ -53,8 +53,8 @@ void SFXProvider::regProvider( SFXProvider* provider )
 }
 
 SFXProvider::SFXProvider( const String& name )
-   :  mName( name ),
-      mNextProvider( NULL )
+   :  mNextProvider( NULL ),
+      mName( name )
 {
    VECTOR_SET_ASSOCIATION( mDeviceInfo );
 

Engine/source/sfx/sfxSystem.cpp

@@ -198,8 +198,8 @@ SFXSystem::SFXSystem()
       mStatNumVoices( 0 ),
       mStatSourceUpdateTime( 0 ),
       mStatParameterUpdateTime( 0 ),
-      mStatAmbientUpdateTime( 0 ),
       mDistanceModel( SFXDistanceModelLinear ),
+      mStatAmbientUpdateTime( 0 ),
       mDopplerFactor( 0.5 ),
       mRolloffFactor( 1.0 ),
       mSoundscapeMgr( NULL )