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

Don't leave stale player CharacterController in Actors when loading game (Fixes #1713)

Browse source
This commit is contained in:
scrawl 2014-07-27 23:10:58 +02:00
parent d81e9cfefd
commit 6262d6c964
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/openmw/mwmechanics/actors.cpp
View file

@ -924,12 +924,7 @@ namespace MWMechanics
Actors::~Actors() Actors::~Actors()
{ {
PtrControllerMap::iterator it(mActors.begin()); clear();
for (; it != mActors.end(); ++it)
{
delete it->second;
it->second = NULL;
}
} }
void Actors::addActor (const MWWorld::Ptr& ptr, bool updateImmediately) void Actors::addActor (const MWWorld::Ptr& ptr, bool updateImmediately)
@ -1359,6 +1354,13 @@ namespace MWMechanics
void Actors::clear() void Actors::clear()
{ {
PtrControllerMap::iterator it(mActors.begin());
for (; it != mActors.end(); ++it)
{
delete it->second;
it->second = NULL;
}
mActors.clear();
mDeathCount.clear(); mDeathCount.clear();
} }
} }

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

@ -2111,8 +2111,8 @@ namespace MWWorld
void World::enableActorCollision(const MWWorld::Ptr& actor, bool enable) void World::enableActorCollision(const MWWorld::Ptr& actor, bool enable)
{ {
OEngine::Physic::PhysicActor *physicActor = mPhysEngine->getCharacter(actor.getRefData().getHandle()); OEngine::Physic::PhysicActor *physicActor = mPhysEngine->getCharacter(actor.getRefData().getHandle());
if (physicActor)
physicActor->enableCollisionBody(enable); physicActor->enableCollisionBody(enable);
} }
bool World::findInteriorPosition(const std::string &name, ESM::Position &pos) bool World::findInteriorPosition(const std::string &name, ESM::Position &pos)