diff options
Diffstat (limited to 'source/gameengine/Physics/Bullet/CcdPhysicsController.h')
-rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsController.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h index c49ae8d20e1..a0b04736bdf 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h @@ -316,7 +316,8 @@ struct CcdConstructionInfo float m_stepHeight; float m_jumpSpeed; float m_fallSpeed; - + unsigned char m_maxJumps; + int m_gamesoftFlag; float m_soft_linStiff; /* linear stiffness 0..1 */ float m_soft_angStiff; /* angular stiffness 0..1 */ @@ -407,19 +408,19 @@ class BlenderBulletCharacterController : public btKinematicCharacterController, { private: btMotionState* m_motionState; - int m_jumps; - int m_maxJumps; + unsigned char m_jumps; + unsigned char m_maxJumps; public: BlenderBulletCharacterController(btMotionState *motionState, btPairCachingGhostObject *ghost, btConvexShape* shape, float stepHeight); virtual void updateAction(btCollisionWorld *collisionWorld, btScalar dt); - int getMaxJumps() const; + unsigned char getMaxJumps() const; - void setMaxJumps(int maxJumps); + void setMaxJumps(unsigned char maxJumps); - int getJumpCount() const; + unsigned char getJumpCount() const; virtual bool canJump() const; @@ -432,9 +433,9 @@ public: virtual bool OnGround(){ return onGround(); } virtual float GetGravity() { return getGravity(); } virtual void SetGravity(float gravity) { setGravity(gravity); } - virtual int GetMaxJumps() { return getMaxJumps(); } - virtual void SetMaxJumps(int maxJumps) { setMaxJumps(maxJumps); } - virtual int GetJumpCount() { return getJumpCount(); } + virtual unsigned char GetMaxJumps() { return getMaxJumps(); } + virtual void SetMaxJumps(unsigned char maxJumps) { setMaxJumps(maxJumps); } + virtual unsigned char GetJumpCount() { return getJumpCount(); } virtual void SetWalkDirection(const MT_Vector3& dir) { btVector3 vec = btVector3(dir[0], dir[1], dir[2]); |