From ae9b5dcc8e8a9a3fd9b23346134aebc21691f601 Mon Sep 17 00:00:00 2001
From: Joshua Ashton <joshua@froggi.es>
Date: Fri, 2 Sep 2022 10:56:21 +0100
Subject: [PATCH] controller_motion: Use std::vector for m_pObjects

---
 vphysics_jolt/vjolt_controller_motion.cpp | 14 +++++++-------
 vphysics_jolt/vjolt_controller_motion.h   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/vphysics_jolt/vjolt_controller_motion.cpp b/vphysics_jolt/vjolt_controller_motion.cpp
index bbe6428..d8160f8 100644
--- a/vphysics_jolt/vjolt_controller_motion.cpp
+++ b/vphysics_jolt/vjolt_controller_motion.cpp
@@ -32,11 +32,11 @@ void JoltPhysicsMotionController::AttachObject( IPhysicsObject *pObject, bool bC
 		return;
 
 	JoltPhysicsObject *pPhysicsObject = static_cast< JoltPhysicsObject * >( pObject );
-	if ( bCheckIfAlreadyAttached && m_pObjects.HasElement( pPhysicsObject ) )
+	if ( bCheckIfAlreadyAttached && VectorContains( m_pObjects, pPhysicsObject ) )
 		return;
 
 	pPhysicsObject->AddDestroyedListener( this );
-	m_pObjects.AddToTail( pPhysicsObject );
+	m_pObjects.push_back( pPhysicsObject );
 }
 
 void JoltPhysicsMotionController::DetachObject( IPhysicsObject *pObject )
@@ -45,7 +45,7 @@ void JoltPhysicsMotionController::DetachObject( IPhysicsObject *pObject )
 		return;
 
 	JoltPhysicsObject *pPhysicsObject = static_cast< JoltPhysicsObject * >( pObject );
-	m_pObjects.FindAndRemove( pPhysicsObject );
+	Erase( m_pObjects, pPhysicsObject );
 	pPhysicsObject->RemoveDestroyedListener( this );
 }
 
@@ -53,18 +53,18 @@ void JoltPhysicsMotionController::DetachObject( IPhysicsObject *pObject )
 
 int JoltPhysicsMotionController::CountObjects( void )
 {
-	return m_pObjects.Count();
+	return int( m_pObjects.size() );
 }
 
 void JoltPhysicsMotionController::GetObjects( IPhysicsObject **pObjectList )
 {
-	for ( int i = 0; i < m_pObjects.Count(); i++ )
+	for ( size_t i = 0; i < m_pObjects.size(); i++ )
 		pObjectList[ i ] = m_pObjects[ i ];
 }
 
 void JoltPhysicsMotionController::ClearObjects( void )
 {
-	m_pObjects.RemoveAll();
+	m_pObjects.clear();
 }
 
 void JoltPhysicsMotionController::WakeObjects( void )
@@ -85,7 +85,7 @@ void JoltPhysicsMotionController::SetPriority( priority_t priority )
 void JoltPhysicsMotionController::OnJoltPhysicsObjectDestroyed( JoltPhysicsObject *pObject )
 {
 	JoltPhysicsObject *pPhysicsObject = static_cast< JoltPhysicsObject * >( pObject );
-	m_pObjects.FindAndRemove( pPhysicsObject );
+	Erase( m_pObjects, pPhysicsObject );
 }
 
 void JoltPhysicsMotionController::OnPreSimulate( float flDeltaTime )
diff --git a/vphysics_jolt/vjolt_controller_motion.h b/vphysics_jolt/vjolt_controller_motion.h
index 3caac28..988514e 100644
--- a/vphysics_jolt/vjolt_controller_motion.h
+++ b/vphysics_jolt/vjolt_controller_motion.h
@@ -29,5 +29,5 @@ public:
 private:
 	IMotionEvent *m_pMotionEvent;
 
-	CUtlVector< JoltPhysicsObject * > m_pObjects;
+	std::vector< JoltPhysicsObject * > m_pObjects;
 };