1 files changed, 4 insertions, 12 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
index 453749b27b3..825a5e525f2 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
@@ -18,6 +18,7 @@ subject to the following restrictions:
 
 #include "PHY_IPhysicsEnvironment.h"
 #include <vector>
+#include <set>
 class CcdPhysicsController;
 #include "LinearMath/btVector3.h"
 #include "LinearMath/btTransform.h"
@@ -185,10 +186,7 @@ protected:
 
 		void	updateCcdPhysicsController(CcdPhysicsController* ctrl, btScalar newMass, int newCollisionFlags, short int newCollisionGroup, short int newCollisionMask);
 
-		void	disableCcdPhysicsController(CcdPhysicsController* ctrl)
-		{ 
-			removeCcdPhysicsController(ctrl); 
-		}
+		void	disableCcdPhysicsController(CcdPhysicsController* ctrl);
 
 		void	enableCcdPhysicsController(CcdPhysicsController* ctrl);
 
@@ -209,12 +207,6 @@ protected:
 		}
 
 	
-		int	GetNumControllers();
-
-		CcdPhysicsController* GetPhysicsController( int index);
-
-		
-
 		const btPersistentManifold*	GetManifold(int index) const;
 
 	
@@ -229,9 +221,9 @@ protected:
 		
 
 		
-		std::vector<CcdPhysicsController*> m_controllers;
+		std::set<CcdPhysicsController*> m_controllers;
 		
-		std::vector<CcdPhysicsController*> m_triggerControllers;
+		std::set<CcdPhysicsController*> m_triggerControllers;
 
 		PHY_ResponseCallback	m_triggerCallbacks[PHY_NUM_RESPONSE];
 		void*			m_triggerCallbacksUserPtrs[PHY_NUM_RESPONSE];