mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-01 21:06:43 +00:00
Code Issues Releases Wiki Activity

Store a pointer to the character controller for non-actor objects

Browse source
This commit is contained in:
Chris Robinson 2013-07-15 23:47:04 -07:00
parent 06e631f213
commit 3a1facefdf
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,14 +17,17 @@ Objects::Objects()
void Objects::addObject(const MWWorld::Ptr& ptr) void Objects::addObject(const MWWorld::Ptr& 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, CharacterController(ptr, anim))); if(anim) mObjects.insert(std::make_pair(ptr, new CharacterController(ptr, anim)));
} }
void Objects::removeObject(const MWWorld::Ptr& ptr) void Objects::removeObject(const MWWorld::Ptr& ptr)
{ {
PtrControllerMap::iterator iter = mObjects.find(ptr); PtrControllerMap::iterator iter = mObjects.find(ptr);
if(iter != mObjects.end()) if(iter != mObjects.end())
{
delete iter->second;
mObjects.erase(iter); mObjects.erase(iter);
}
} }
void Objects::updateObject(const MWWorld::Ptr &old, const MWWorld::Ptr &ptr) void Objects::updateObject(const MWWorld::Ptr &old, const MWWorld::Ptr &ptr)
@ -32,10 +35,10 @@ void Objects::updateObject(const MWWorld::Ptr &old, const MWWorld::Ptr &ptr)
PtrControllerMap::iterator iter = mObjects.find(old); PtrControllerMap::iterator iter = mObjects.find(old);
if(iter != mObjects.end()) if(iter != mObjects.end())
{ {
CharacterController ctrl = iter->second; CharacterController *ctrl = iter->second;
mObjects.erase(iter); mObjects.erase(iter);
ctrl.updatePtr(ptr); ctrl->updatePtr(ptr);
mObjects.insert(std::make_pair(ptr, ctrl)); mObjects.insert(std::make_pair(ptr, ctrl));
} }
} }
@ -46,7 +49,10 @@ void Objects::dropObjects (const MWWorld::Ptr::CellStore *cellStore)
while(iter != mObjects.end()) while(iter != mObjects.end())
{ {
if(iter->first.getCell()==cellStore) if(iter->first.getCell()==cellStore)
{
delete iter->second;
mObjects.erase(iter++); mObjects.erase(iter++);
}
else else
++iter; ++iter;
} }
@ -59,7 +65,7 @@ void Objects::update(float duration, bool paused)
for(PtrControllerMap::iterator iter(mObjects.begin());iter != mObjects.end();++iter) for(PtrControllerMap::iterator iter(mObjects.begin());iter != mObjects.end();++iter)
{ {
Movement movement; Movement movement;
iter->second.update(duration, movement); iter->second->update(duration, movement);
} }
} }
} }
@ -68,13 +74,13 @@ void Objects::playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& gro
{ {
PtrControllerMap::iterator iter = mObjects.find(ptr); PtrControllerMap::iterator iter = mObjects.find(ptr);
if(iter != mObjects.end()) if(iter != mObjects.end())
iter->second.playGroup(groupName, mode, number); iter->second->playGroup(groupName, mode, number);
} }
void Objects::skipAnimation(const MWWorld::Ptr& ptr) void Objects::skipAnimation(const MWWorld::Ptr& ptr)
{ {
PtrControllerMap::iterator iter = mObjects.find(ptr); PtrControllerMap::iterator iter = mObjects.find(ptr);
if(iter != mObjects.end()) if(iter != mObjects.end())
iter->second.skipAnim(); iter->second->skipAnim();
} }
} }

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

@ -16,7 +16,7 @@ namespace MWMechanics
{ {
class Objects class Objects
{ {
typedef std::map<MWWorld::Ptr,CharacterController> PtrControllerMap; typedef std::map<MWWorld::Ptr,CharacterController*> PtrControllerMap;
PtrControllerMap mObjects; PtrControllerMap mObjects;
public: public: