soc-2008-mxcurioni: merged changes to revision 15705
[blender.git] / source / gameengine / Ketsji / KX_SumoPhysicsController.h
index 8c061ae4056c1ee8e917f1ef661ecd68211ad2b4..1dd930bf3d971e2b07ea4cf3351abad2315a0ba8 100644 (file)
@@ -76,10 +76,10 @@ public:
        void    resolveCombinedVelocities(float linvelX,float linvelY,float linvelZ,float angVelX,float angVelY,float angVelZ);
 
 
-       void    SuspendDynamics();
+       void    SuspendDynamics(bool);
        void    RestoreDynamics();
        virtual void    getOrientation(MT_Quaternion& orn);
-       virtual void setOrientation(const MT_Quaternion& orn);
+       virtual void setOrientation(const MT_Matrix3x3& orn);
        
        virtual void setPosition(const MT_Point3& pos);
        virtual void setScaling(const MT_Vector3& scaling);