fix: Fix -Wreorder warnings

StrataSource · Oct 26, 2023 · 1e3e0dd · 1e3e0dd
1 parent 154b347
commit 1e3e0dd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/vphysics_jolt/vjolt_constraints.cpp b/vphysics_jolt/vjolt_constraints.cpp
@@ -76,13 +76,13 @@ void JoltPhysicsConstraintGroup::RemoveConstraint( JoltPhysicsConstraint *pConst
 //-------------------------------------------------------------------------------------------------
 
 JoltPhysicsConstraint::JoltPhysicsConstraint( JoltPhysicsEnvironment *pPhysicsEnvironment, IPhysicsObject *pReferenceObject, IPhysicsObject *pAttachedObject, constraintType_t Type, JPH::Constraint* pConstraint, void *pGameData )
-	: m_pPhysicsEnvironment( pPhysicsEnvironment )
-	, m_pPhysicsSystem( pPhysicsEnvironment->GetPhysicsSystem() )
-	, m_pObjReference( static_cast<JoltPhysicsObject*>( pReferenceObject ) )
+	: m_pObjReference( static_cast<JoltPhysicsObject*>( pReferenceObject ) )
 	, m_pObjAttached( static_cast<JoltPhysicsObject*>( pAttachedObject ) )
-	, m_ConstraintType( Type )
 	, m_pConstraint( pConstraint )
+	, m_ConstraintType( Type )
 	, m_pGameData( pGameData )
+	, m_pPhysicsEnvironment( pPhysicsEnvironment )
+	, m_pPhysicsSystem( pPhysicsEnvironment->GetPhysicsSystem() )
 {
 	m_pObjReference->AddDestroyedListener( this );
 	m_pObjAttached->AddDestroyedListener( this );

diff --git a/vphysics_jolt/vjolt_controller_vehicle.cpp b/vphysics_jolt/vjolt_controller_vehicle.cpp
@@ -50,8 +50,8 @@ JoltPhysicsVehicleController::JoltPhysicsVehicleController( JoltPhysicsEnvironme
 	: m_pEnvironment( pEnvironment )
 	, m_pPhysicsSystem( pPhysicsSystem )
 	, m_pCarBodyObject( pVehicleBodyObject )
-	, m_VehicleType( nVehicleType )
 	, m_VehicleParams( params )
+	, m_VehicleType( nVehicleType )
 {
 	JPH::VehicleConstraintSettings vehicle;
 	vehicle.mUp					= VehicleUpVector;

diff --git a/vphysics_jolt/vjolt_object.cpp b/vphysics_jolt/vjolt_object.cpp
@@ -22,16 +22,16 @@
 //-------------------------------------------------------------------------------------------------
 
 JoltPhysicsObject::JoltPhysicsObject( JPH::Body *pBody, JoltPhysicsEnvironment *pEnvironment, bool bStatic, int nMaterialIndex, const objectparams_t *pParams )
-	: m_pBody( pBody )
-	, m_pEnvironment( pEnvironment )
-	, m_pPhysicsSystem( pEnvironment->GetPhysicsSystem() )
+	: m_pGameData( pParams->pGameData )
+	, m_pName( pParams->pName )
 	, m_bStatic( bStatic )
+	, m_materialIndex( Max( nMaterialIndex, 0 ) ) // Sometimes we get passed -1.
 	, m_flCachedMass( pParams->mass )
 	, m_flCachedInvMass( m_flCachedMass ? 1.0f / m_flCachedMass : 0.0f )
-	, m_pGameData( pParams->pGameData )
-	, m_materialIndex( Max( nMaterialIndex, 0 ) ) // Sometimes we get passed -1.
 	, m_flVolume( pParams->volume )
-	, m_pName( pParams->pName )
+	, m_pBody( pBody )
+	, m_pEnvironment( pEnvironment )
+	, m_pPhysicsSystem( pEnvironment->GetPhysicsSystem() )
 {
 	// Josh:
 	// Assert that m_pGameData is the first element, some games
@@ -52,10 +52,10 @@ JoltPhysicsObject::JoltPhysicsObject( JPH::Body *pBody, JoltPhysicsEnvironment *
 }
 
 JoltPhysicsObject::JoltPhysicsObject( JPH::Body *pBody, JoltPhysicsEnvironment *pEnvironment, void *pGameData, JPH::StateRecorder &recorder )
-	: m_pBody( pBody )
+	: m_pGameData( pGameData )
+	, m_pBody( pBody )
 	, m_pEnvironment( pEnvironment )
 	, m_pPhysicsSystem( pEnvironment->GetPhysicsSystem() )
-	, m_pGameData( pGameData )
 {
 	RestoreObjectState( recorder );
 }