Merge pull request #356 from Azaezel/alpha40_mountchainCollisions

sceneobject mountchain enable/disable collision aug
This commit is contained in:
Brian Roberts 2020-10-11 16:00:56 -05:00 committed by GitHub
commit 8a252458d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -293,6 +293,8 @@ bool SceneObject::collideBox(const Point3F &start, const Point3F &end, RayInfo *
void SceneObject::disableCollision()
{
for (SceneObject* ptr = getMountList(); ptr; ptr = ptr->getMountLink())
ptr->disableCollision();
mCollisionCount++;
AssertFatal(mCollisionCount < 50, "SceneObject::disableCollision called 50 times on the same object. Is this inside a circular loop?" );
}
@ -301,6 +303,8 @@ void SceneObject::disableCollision()
void SceneObject::enableCollision()
{
for (SceneObject* ptr = getMountList(); ptr; ptr = ptr->getMountLink())
ptr->enableCollision();
if (mCollisionCount)
--mCollisionCount;
}