soc-2008-mxcurioni: merged changes to revision 15705
[blender.git] / source / gameengine / Ketsji / KX_SumoPhysicsController.cpp
index 6ea5461dbaa3687068b91ccf0231a599a9b485cc..4032a795ce3892f4a7fed2c97618712f630d7dca 100644 (file)
@@ -101,7 +101,7 @@ void        KX_SumoPhysicsController::SetSumoTransform(bool nondynaonly)
 
 }
 
-void   KX_SumoPhysicsController::SuspendDynamics()
+void   KX_SumoPhysicsController::SuspendDynamics(bool)
 {
        SumoPhysicsController::SuspendDynamics();
 }
@@ -170,8 +170,9 @@ void        KX_SumoPhysicsController::setMargin(float collisionMargin)
 }
 
 
-void KX_SumoPhysicsController::setOrientation(const MT_Quaternion& orn)
+void KX_SumoPhysicsController::setOrientation(const MT_Matrix3x3& rot)
 {
+       MT_Quaternion orn = rot.getRotation();
        SumoPhysicsController::setOrientation(
                orn[0],orn[1],orn[2],orn[3]);