Merge pull request #1343 from raistlin/FixRandomWorder

Fixed some random gcc's -Wreorder warnings

Engine/source/console/engineTypeInfo.h

@@ -173,8 +173,8 @@ class EngineFieldTable
       /// Construct a field table from a NULL-terminated array of Field
       /// records.
       EngineFieldTable( const Field* fields )
-         : mFields( fields ),
-           mNumFields( 0 )
+         : mNumFields( 0 ),
+           mFields( fields )
       {
          while( fields[ mNumFields ].getName() )
             mNumFields ++;

Engine/source/console/simObjectRef.h

@@ -44,9 +44,9 @@ public:
    static S32 _smTypeId;
 
    SimObjectRef()
-      : mId( 0 ),
-        mObject( NULL ),
-        mName( "" )
+      : mName( "" ),
+        mId( 0 ),
+        mObject( NULL )
    {
    }
    
@@ -178,4 +178,4 @@ public:
 };
 
 
-#endif // _SIMOBJECTREF_H_
+#endif // _SIMOBJECTREF_H_

Engine/source/core/module.h

@@ -79,9 +79,9 @@ class Module
          
          Dependency( Mode mode, DependencyType type, Module* parentModule, const char* moduleName )
             : mType( type ),
-              mNext( mode == ModeInitialize ? parentModule->mInitDependencies : parentModule->mShutdownDependencies ),
               mModuleName( moduleName ),
-              mModule( NULL )
+              mModule( NULL ),
+              mNext( mode == ModeInitialize ? parentModule->mInitDependencies : parentModule->mShutdownDependencies )
          {
             if( mode == ModeInitialize )
                parentModule->mInitDependencies = this;
@@ -141,11 +141,12 @@ class Module
       }
             
       Module()
-         : mNext( smFirst ),
+         : mIsInitialized( false ),
+           mNext( smFirst ),
            mInitDependencies( NULL ),
            mShutdownDependencies( NULL ),
-           mOverrides( NULL ),
-           mIsInitialized( false )
+           mOverrides( NULL )
+
       {
          smFirst = this;
       }

Engine/source/core/util/rawData.h

@@ -58,7 +58,7 @@ class RawDataT
       }
 
       RawDataT( T* data, U32 size, bool ownMemory = false )
-         : data( data ), size( size ), ownMemory( ownMemory ) {}
+         : ownMemory( ownMemory ), data( data ), size( size ) {}
 
       RawDataT(const ThisType& rd)
       {

Engine/source/core/util/tUnmanagedVector.h

@@ -45,7 +45,7 @@ class UnmanagedVector
       UnmanagedVector()
          : mCount( 0 ), mArray( NULL ) {}
       UnmanagedVector( T* array, U32 count )
-         : mArray( array ), mCount( count ) {}
+         : mCount( count ), mArray( array ) {}
 
       U32 size() const { return mCount; }
       bool empty() const { return ( mCount == 0 ); }

Engine/source/gfx/gfxVertexBuffer.h

@@ -64,11 +64,11 @@ public:
                      const GFXVertexFormat *vertexFormat, 
                      U32 vertexSize, 
                      GFXBufferType bufferType )
-      :  mDevice( device ),
-         mVolatileStart( 0 ),         
-         mNumVerts( numVerts ),
+      :  mNumVerts( numVerts ),
          mVertexSize( vertexSize ),
-         mBufferType( bufferType )      
+         mBufferType( bufferType ),
+         mDevice( device ),
+         mVolatileStart( 0 )
    {
       if ( vertexFormat )
       {

Engine/source/platform/async/asyncPacketQueue.h

@@ -156,12 +156,13 @@ class AsyncPacketQueue
                            Consumer consumer,
                            TickType totalTicks = 0,
                            bool dropPackets = false )
-         : mTotalTicks( totalTicks ),
+         : mDropPackets( dropPackets ),
+           mTotalTicks( totalTicks ),
            mTotalQueuedTicks( 0 ),
            mPacketQueue( maxQueuedPackets ),
            mTimeSource( timeSource ),
-           mConsumer( consumer ),
-           mDropPackets( dropPackets )
+           mConsumer( consumer )
+
       {
          #ifdef TORQUE_DEBUG
          mTotalQueuedPackets = 0;

Engine/source/platform/async/asyncPacketStream.h

@@ -56,10 +56,10 @@ class AsyncPacket : public RawDataT< T >
       typedef RawDataT< T > Parent;
 
       AsyncPacket()
-         : mIndex( 0 ), mIsLast( false ), mSizeActual( 0 ) {}
+         : mIndex( 0 ), mSizeActual( 0 ), mIsLast( false ) {}
       AsyncPacket( T* data, U32 size, bool ownMemory = false )
          : Parent( data, size, ownMemory ),
-           mIndex( 0 ), mIsLast( false ), mSizeActual( 0 ) {}
+           mIndex( 0 ), mSizeActual( 0 ), mIsLast( false ) {}
 
       /// Running number in stream.
       U32 mIndex;

Engine/source/platform/threads/threadPoolAsyncIO.h

@@ -100,8 +100,8 @@ class AsyncIOItem : public ThreadPool::WorkItem
          : Parent( context ),
            mStream( stream ),
            mNumElements( numElements ),
-           mOffsetInStream( offsetInStream ),
-           mOffsetInBuffer( 0 ) {}
+           mOffsetInBuffer( 0 ),
+           mOffsetInStream( offsetInStream ) {}
 
       /// Construct a read item on "stream" that stores data into the given "buffer".
       ///
@@ -109,11 +109,11 @@ class AsyncIOItem : public ThreadPool::WorkItem
                    U32 numElements, OffsetType offsetInStream, bool takeOwnershipOfBuffer = true,
                    ThreadContext* context = 0 )
          : Parent( context ),
-           mStream( stream ),
            mBuffer( buffer ),
+           mStream( stream ),
            mNumElements( numElements ),
-           mOffsetInStream( offsetInStream ),
-           mOffsetInBuffer( offsetInBuffer )
+           mOffsetInBuffer( offsetInBuffer ),
+           mOffsetInStream( offsetInStream )
       {
          if( takeOwnershipOfBuffer )
             mBuffer.ownMemory = true;

Engine/source/scene/culling/sceneCullingVolume.h

@@ -79,7 +79,7 @@ class SceneCullingVolume
 
       ///
       SceneCullingVolume( Type type, const PlaneSetF& planes )
-         : mType( type ), mClippingPlanes( planes ), mSortPoint( 1.f ) {}
+         : mType( type ), mSortPoint( 1.f ), mClippingPlanes( planes ) {}
 
       /// Return the type of volume defined by this culling volume, i.e. whether it includes
       /// or excludes space.

Engine/source/sfx/sfxCommon.h

@@ -224,8 +224,8 @@ class SFXFormat
                   U8 bitsPerSample = 0,
                   U32 samplesPerSecond = 0 )
          :  mChannels( channels ),
-            mSamplesPerSecond( samplesPerSecond ), 
-            mBitsPerSample( bitsPerSample )
+            mBitsPerSample( bitsPerSample ),
+            mSamplesPerSecond( samplesPerSecond )
       {}
 
       /// Copy constructor.

Engine/source/sfx/sfxDevice.cpp

@@ -36,10 +36,10 @@ SFXDevice::SFXDevice( const String& name, SFXProvider* provider, bool useHardwar
       mProvider( provider ),
       mUseHardware( useHardware ),
       mMaxBuffers( maxBuffers ),
-      mStatNumBufferBytes( 0 ),
+      mCaps( 0 ),
       mStatNumBuffers( 0 ),
       mStatNumVoices( 0 ),
-      mCaps( 0 )
+      mStatNumBufferBytes( 0 )
 {
    AssertFatal( provider, "We must have a provider pointer on device creation!" );