Added resolveCombinedVelocities()

Fixed drot actuator.  The rotation matrix was being mutilated by passing a float[9] instead of float[12].

3 files changed, 9 insertions, 5 deletions

diff --git a/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Object.h b/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Object.h
index aec4a410e1f..de9d2e20044 100644
--- a/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Object.h
+++ b/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Object.h
@@ -267,7 +267,7 @@ private:
 	actualAngVelocity(
 	) const ;
 	
-	bool dynamicCollision(const MT_Point3 &local2, 
+	void dynamicCollision(const MT_Point3 &local2, 
 		const MT_Vector3 &normal, 
 		MT_Scalar dist, 
 		const MT_Vector3 &rel_vel,
diff --git a/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Object.cpp b/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Object.cpp
index cdf1a77adb3..ee8a7da953c 100644
--- a/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Object.cpp
+++ b/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Object.cpp
@@ -160,7 +160,7 @@ integrateMomentum(
 	}
 }
 
-bool SM_Object::dynamicCollision(const MT_Point3 &local2, 
+void SM_Object::dynamicCollision(const MT_Point3 &local2, 
 	const MT_Vector3 &normal, 
 	MT_Scalar dist, 
 	const MT_Vector3 &rel_vel,
@@ -297,7 +297,6 @@ bool SM_Object::dynamicCollision(const MT_Point3 &local2,
 		notifyClient();
 
 	}
-	return false;
 }
 
 DT_Bool SM_Object::boing(
diff --git a/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Scene.cpp b/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Scene.cpp
index 0171d5f265e..38c2b48e460 100644
--- a/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Scene.cpp
+++ b/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Scene.cpp
@@ -303,8 +303,13 @@ DT_Bool SM_Scene::boing(
 
 SM_Scene::~SM_Scene()
 { 
-/*	if (m_objectList.begin() != m_objectList.end())
-		std::cout << "SM_Scene::~SM_Scene: There are still objects in the Sumo scene!" << std::endl; */
+//	if (m_objectList.begin() != m_objectList.end()) 
+//		std::cout << "SM_Scene::~SM_Scene: There are still objects in the Sumo scene!" << std::endl;
+	for (T_ObjectList::iterator it = m_objectList.begin() ; it != m_objectList.end() ; it++)
+		delete *it;
+	
 	DT_DestroyRespTable(m_respTable);
+	DT_DestroyRespTable(m_secondaryRespTable);
+	DT_DestroyRespTable(m_fixRespTable);
 	DT_DestroyScene(m_scene);
 }