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

implemented handling of disabled actors

Browse source
This commit is contained in:
Marc Zinnschlag 2010-07-27 20:43:46 +08:00 committed by apreiml
parent 362605860b
commit fef6fc1340
4 changed files with 39 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwmechanics/mechanicsmanager.cpp
View file

@ -45,6 +45,11 @@ namespace MWMechanics
mActors.insert (ptr); mActors.insert (ptr);
} }
void MechanicsManager::removeActor (const MWWorld::Ptr& ptr)
{
mActors.erase (ptr);
}
void MechanicsManager::dropActors (const MWWorld::Ptr::CellStore *cellStore) void MechanicsManager::dropActors (const MWWorld::Ptr::CellStore *cellStore)
{ {
std::set<MWWorld::Ptr>::iterator iter = mActors.begin(); std::set<MWWorld::Ptr>::iterator iter = mActors.begin();

5
apps/openmw/mwmechanics/mechanicsmanager.hpp
View file

@ -31,7 +31,10 @@ namespace MWMechanics
void addActor (const MWWorld::Ptr& ptr); void addActor (const MWWorld::Ptr& ptr);
///< Register an actor for stats management ///< Register an actor for stats management
void removeActor (const MWWorld::Ptr& ptr);
///< Deregister an actor for stats management
void dropActors (const MWWorld::Ptr::CellStore *cellStore); void dropActors (const MWWorld::Ptr::CellStore *cellStore);
///< Deregister all actors in the given cell. ///< Deregister all actors in the given cell.
}; };

6
apps/openmw/mwworld/ptr.hpp
View file

@ -37,6 +37,12 @@ namespace MWWorld
return mPtr.empty(); return mPtr.empty();
} }
const std::type_info& getType()
{
assert (!mPtr.empty());
return mPtr.type();
}
template<typename T> template<typename T>
Ptr (ESMS::LiveCellRef<T, RefData> *liveCellRef, CellStore *cell) Ptr (ESMS::LiveCellRef<T, RefData> *liveCellRef, CellStore *cell)
{ {

28
apps/openmw/mwworld/world.cpp
View file

@ -275,6 +275,13 @@ namespace MWWorld
if (MWRender::CellRender *render = searchRender (reference.getCell())) if (MWRender::CellRender *render = searchRender (reference.getCell()))
{ {
render->enable (reference.getRefData().getHandle()); render->enable (reference.getRefData().getHandle());
if (mActiveCells.find (reference.getCell())!=mActiveCells.end() &&
(reference.getType()==typeid (ESMS::LiveCellRef<ESM::NPC, RefData>) ||
reference.getType()==typeid (ESMS::LiveCellRef<ESM::Creature, RefData>)))
{
mEnvironment.mMechanicsManager->addActor (reference);
}
} }
} }
} }
@ -288,6 +295,13 @@ namespace MWWorld
if (MWRender::CellRender *render = searchRender (reference.getCell())) if (MWRender::CellRender *render = searchRender (reference.getCell()))
{ {
render->disable (reference.getRefData().getHandle()); render->disable (reference.getRefData().getHandle());
if (mActiveCells.find (reference.getCell())!=mActiveCells.end() &&
(reference.getType()==typeid (ESMS::LiveCellRef<ESM::NPC, RefData>) ||
reference.getType()==typeid (ESMS::LiveCellRef<ESM::Creature, RefData>)))
{
mEnvironment.mMechanicsManager->removeActor (reference);
}
} }
} }
} }
@ -456,16 +470,22 @@ namespace MWWorld
cell->creatures.list.begin()); cell->creatures.list.begin());
iter!=cell->creatures.list.end(); ++iter) iter!=cell->creatures.list.end(); ++iter)
{ {
Ptr ptr (&*iter, cell); if (iter->mData.isEnabled())
mEnvironment.mMechanicsManager->addActor (ptr); {
Ptr ptr (&*iter, cell);
mEnvironment.mMechanicsManager->addActor (ptr);
}
} }
for (ESMS::CellRefList<ESM::NPC, RefData>::List::iterator iter ( for (ESMS::CellRefList<ESM::NPC, RefData>::List::iterator iter (
cell->npcs.list.begin()); cell->npcs.list.begin());
iter!=cell->npcs.list.end(); ++iter) iter!=cell->npcs.list.end(); ++iter)
{ {
Ptr ptr (&*iter, cell); if (iter->mData.isEnabled())
mEnvironment.mMechanicsManager->addActor (ptr); {
Ptr ptr (&*iter, cell);
mEnvironment.mMechanicsManager->addActor (ptr);
}
} }
// Sky system // Sky system