Changeset 2907 for code/branches/questsystem5/src/bullet/BulletDynamics/Character/btCharacterControllerInterface.h

Timestamp:

Apr 8, 2009, 12:36:08 AM (16 years ago)

Author:

dafrick

Message:

Merging of the current QuestSystem branch.

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/bullet/BulletDynamics/Character/btCharacterControllerInterface.h (modified) (2 diffs)

code/branches/questsystem5/src/bullet/BulletDynamics/Character/btCharacterControllerInterface.h

@@ -18 +18 @@
 
 #include "LinearMath/btVector3.h"
+#include "BulletDynamics/Dynamics/btActionInterface.h"
 
 class btCollisionShape;
@@ -23 +24 @@
 class btCollisionWorld;
 
-class btCharacterControllerInterface
+class btCharacterControllerInterface : public btActionInterface
 {
 public: