Merge pull request #1344 from eightyeight/fix-wreorder

Fix -Wreorder warnings from ShapeBase

Engine/source/T3D/shapeBase.cpp

@@ -154,28 +154,8 @@ ShapeBaseData::ShapeBaseData()
    shadowSphereAdjust( 1.0f ),
    shapeName( StringTable->insert("") ),
    cloakTexName( StringTable->insert("") ),
-   mass( 1.0f ),
+   cubeDescId( 0 ),
-   drag( 0.0f ),
+   reflectorDesc( NULL ),
-   density( 1.0f ),
-   maxEnergy( 0.0f ),
-   maxDamage( 1.0f ),
-   disabledLevel( 1.0f ),
-   destroyedLevel( 1.0f ),
-   repairRate( 0.0033f ),
-   eyeNode( -1 ),
-   earNode( -1 ),
-   cameraNode( -1 ),
-   damageSequence( -1 ),
-   hulkSequence( -1 ),
-   cameraMaxDist( 0.0f ),
-   cameraMinDist( 0.2f ),
-   cameraDefaultFov( 75.0f ),
-   cameraMinFov( 5.0f ),
-   cameraMaxFov( 120.f ),
-   cameraCanBank( false ),
-   mountedImagesBank( false ),
-   isInvincible( false ),
-   renderWhenDestroyed( true ),
    debris( NULL ),
    debrisID( 0 ),
    debrisShapeName( StringTable->insert("") ),
@@ -183,15 +163,35 @@ ShapeBaseData::ShapeBaseData()
    explosionID( 0 ),
    underwaterExplosion( NULL ),
    underwaterExplosionID( 0 ),
+   mass( 1.0f ),
+   drag( 0.0f ),
+   density( 1.0f ),
+   maxEnergy( 0.0f ),
+   maxDamage( 1.0f ),
+   destroyedLevel( 1.0f ),
+   disabledLevel( 1.0f ),
+   repairRate( 0.0033f ),
+   eyeNode( -1 ),
+   earNode( -1 ),
+   cameraNode( -1 ),
+   cameraMaxDist( 0.0f ),
+   cameraMinDist( 0.2f ),
+   cameraDefaultFov( 75.0f ),
+   cameraMinFov( 5.0f ),
+   cameraMaxFov( 120.f ),
+   cameraCanBank( false ),
+   mountedImagesBank( false ),
+   debrisDetail( -1 ),
+   damageSequence( -1 ),
+   hulkSequence( -1 ),
+   observeThroughObject( false ),
    firstPersonOnly( false ),
    useEyePoint( false ),
-   cubeDescId( 0 ),
+   isInvincible( false ),
-   reflectorDesc( NULL ),
+   renderWhenDestroyed( true ),
-   observeThroughObject( false ),
    computeCRC( false ),
    inheritEnergyFromMount( false ),
-   mCRC( 0 ),
+   mCRC( 0 )
-   debrisDetail( -1 )
 {      
    dMemset( mountPointNode, -1, sizeof( S32 ) * SceneObject::NumMountPoints );
 }
@@ -878,46 +878,46 @@ IMPLEMENT_CALLBACK( ShapeBase, validateCameraFov, F32, (F32 fov), (fov),
    "@see ShapeBaseData\n\n");
 
 ShapeBase::ShapeBase()
- : mDrag( 0.0f ),
+ : mDataBlock( NULL ),
-   mBuoyancy( 0.0f ),
+   mIsAiControlled( false ),
-   mWaterCoverage( 0.0f ),
-   mLiquidHeight( 0.0f ),
    mControllingObject( NULL ),
-   mGravityMod( 1.0f ),
+   mMoveMotion( false ),
-   mAppliedForce( Point3F::Zero ),
+   mShapeBaseMount( NULL ),
-   mTimeoutList( NULL ),
-   mDataBlock( NULL ),
    mShapeInstance( NULL ),
+   mConvexList( new Convex ),
    mEnergy( 0.0f ),
    mRechargeRate( 0.0f ),
+   mMass( 1.0f ),
+   mOneOverMass( 1.0f ),
+   mDrag( 0.0f ),
+   mBuoyancy( 0.0f ),
+   mLiquidHeight( 0.0f ),
+   mWaterCoverage( 0.0f ),
+   mAppliedForce( Point3F::Zero ),
+   mGravityMod( 1.0f ),
+   mDamageFlash( 0.0f ),
+   mWhiteOut( 0.0f ),
+   mFlipFadeVal( false ),
+   mTimeoutList( NULL ),
    mDamage( 0.0f ),
    mRepairRate( 0.0f ),
    mRepairReserve( 0.0f ),
    mDamageState( Enabled ),
    mDamageThread( NULL ),
    mHulkThread( NULL ),
-   mLastRenderFrame( 0 ),
+   damageDir( 0.0f, 0.0f, 1.0f ),
-   mLastRenderDistance( 0.0f ),
    mCloaked( false ),
    mCloakLevel( 0.0f ),
-   mDamageFlash( 0.0f ),
-   mWhiteOut( 0.0f ),
-   mIsControlled( false ),
-   mConvexList( new Convex ),
-   mCameraFov( 90.0f ),
    mFadeOut( true ),
    mFading( false ),
    mFadeVal( 1.0f ),
-   mFadeTime( 1.0f ),
    mFadeElapsedTime( 0.0f ),
+   mFadeTime( 1.0f ),
    mFadeDelay( 0.0f ),
-   mFlipFadeVal( false ),
+   mCameraFov( 90.0f ),
-   damageDir( 0.0f, 0.0f, 1.0f ),
+   mIsControlled( false ),
-   mShapeBaseMount( NULL ),
+   mLastRenderFrame( 0 ),
-   mMass( 1.0f ),
+   mLastRenderDistance( 0.0f )
-   mOneOverMass( 1.0f ),
-   mMoveMotion( false ),
-   mIsAiControlled( false )
 {
    mTypeMask |= ShapeBaseObjectType | LightObjectType;