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

Merge remote-tracking branch 'zini/master' into ptr-improvements

Browse source
This commit is contained in:
Chris Robinson 2013-08-15 07:11:38 -07:00
commit 58481ec7c3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwworld/worldimp.cpp
View file

@ -465,7 +465,7 @@ namespace MWWorld
iter!=mWorldScene->getActiveCells().end(); ++iter)
{
Ptr::CellStore* cellstore = *iter;
Ptr ptr = mCells.getPtr (name, *cellstore);
Ptr ptr = mCells.getPtr (name, *cellstore, true);
if (!ptr.isEmpty())
return ptr;
@ -1772,7 +1772,7 @@ namespace MWWorld
void World::enableActorCollision(const MWWorld::Ptr& actor, bool enable)
{
OEngine::Physic::PhysicActor *physicActor = mPhysEngine->getCharacter(actor.getRefData().getHandle());
physicActor->enableCollisions(enable);
}