BGE: Adding a jumpCount to KX_CharacterWrapper. This can be used to have different logic for a single jump versus a double jump. For example, a different animation for the second jump.

3 files changed, 12 insertions, 0 deletions

diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
index 66c6d1aa251..cf96f22a345 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
@@ -92,6 +92,11 @@ void BlenderBulletCharacterController::setMaxJumps(int maxJumps)
 	m_maxJumps = maxJumps;
 }
 
+int BlenderBulletCharacterController::getJumpCount() const
+{
+	return m_jumps;
+}
+
 bool BlenderBulletCharacterController::canJump() const
 {
 	return onGround() || m_jumps < m_maxJumps;
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
index 91b2e558521..b151c2f6b59 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
@@ -412,6 +412,8 @@ public:
 
 	void setMaxJumps(int maxJumps);
 
+	int getJumpCount() const;
+
 	virtual bool canJump() const;
 
 	virtual void jump();
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
index f1224babcf7..cadba97023e 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
@@ -305,6 +305,11 @@ public:
 	{
 		m_controller->setMaxJumps(maxJumps);
 	}
+
+	virtual int GetJumpCount()
+	{
+		return m_controller->getJumpCount();
+	}
 };
 
 class CcdOverlapFilterCallBack : public btOverlapFilterCallback