diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2012-08-08 05:29:20 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2012-08-08 05:29:20 +0400 |
| commit | 47c7266522ac4c9e35a8aa227a6289fa7e50a7ad (patch) | |
| tree | fd0855db9c41f55399b033fa591f47e3b4306a28 /source/gameengine/Ketsji/KX_GameObject.cpp | |
| parent | 843b45cafa618cd6230a16ca13f24860b3301b39 (diff) | |
Accidentally did a commit when I wanted to revert... (ignore my last revision)
Diffstat (limited to 'source/gameengine/Ketsji/KX_GameObject.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index 5b8d5fbfe1f..04a806dfd92 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -481,19 +481,6 @@ void KX_GameObject::ActivateGraphicController(bool recurse) } } -void KX_GameObject::SetUserCollisionGroup(short group) -{ - m_userCollisionGroup = group; -} -void KX_GameObject::SetUserCollisionMask(short mask) -{ - m_userCollisionMask = mask; -} - -bool KX_GameObject::CheckCollision(KX_GameObject* other) -{ - return this->m_userCollisionGroup & other->m_userCollisionMask; -} CValue* KX_GameObject::GetReplica() { |