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

Ensure mechanics actors/objects are cleared before adding them

Browse source
This commit is contained in:
Chris Robinson 2013-07-17 21:39:21 -07:00
parent c7692acb79
commit d6324d71bf
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -170,6 +170,8 @@ namespace MWMechanics
// erase previous death events since we are currently only tracking them while in an active cell // erase previous death events since we are currently only tracking them while in an active cell
MWWorld::Class::get(ptr).getCreatureStats(ptr).clearHasDied(); MWWorld::Class::get(ptr).getCreatureStats(ptr).clearHasDied();
removeActor(ptr);
MWRender::Animation *anim = MWBase::Environment::get().getWorld()->getAnimation(ptr); MWRender::Animation *anim = MWBase::Environment::get().getWorld()->getAnimation(ptr);
mActors.insert(std::make_pair(ptr, new CharacterController(ptr, anim))); mActors.insert(std::make_pair(ptr, new CharacterController(ptr, anim)));
} }

2
apps/openmw/mwmechanics/objects.cpp
View file

@ -16,6 +16,8 @@ Objects::Objects()
void Objects::addObject(const MWWorld::Ptr& ptr) void Objects::addObject(const MWWorld::Ptr& ptr)
{ {
removeObject(ptr);
MWRender::Animation *anim = MWBase::Environment::get().getWorld()->getAnimation(ptr); MWRender::Animation *anim = MWBase::Environment::get().getWorld()->getAnimation(ptr);
if(anim) mObjects.insert(std::make_pair(ptr, new CharacterController(ptr, anim))); if(anim) mObjects.insert(std::make_pair(ptr, new CharacterController(ptr, anim)));
} }