krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Added check before attempting to remove actor's collision object from world

Browse source
This commit is contained in:
Aussiemon 2016-12-14 19:05:30 -07:00
parent 2eb6ef50ca
commit e30dfb13d3
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwphysics/actor.cpp
View file

@ -72,7 +72,10 @@ void Actor::enableCollisionBody(bool collision)
void Actor::updateCollisionMask() void Actor::updateCollisionMask()
{ {
if (mCollisionObject.get()->getWorldArrayIndex() >= 0)
{
mCollisionWorld->removeCollisionObject(mCollisionObject.get()); mCollisionWorld->removeCollisionObject(mCollisionObject.get());
}
int collisionMask = CollisionType_World | CollisionType_HeightMap; int collisionMask = CollisionType_World | CollisionType_HeightMap;
if (mExternalCollisionMode) if (mExternalCollisionMode)
collisionMask |= CollisionType_Actor | CollisionType_Projectile | CollisionType_Door; collisionMask |= CollisionType_Actor | CollisionType_Projectile | CollisionType_Door;