From 47c7266522ac4c9e35a8aa227a6289fa7e50a7ad Mon Sep 17 00:00:00 2001 From: Mitchell Stokes Date: Wed, 8 Aug 2012 01:29:20 +0000 Subject: Accidentally did a commit when I wanted to revert... (ignore my last revision) --- source/gameengine/Ketsji/KX_GameObject.cpp | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'source/gameengine/Ketsji/KX_GameObject.cpp') 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() { -- cgit v1.2.3