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

[Client] Add searchPtrViaRefIndex method to World to easily find objects

Browse source
This commit is contained in:
David Cernat 2018-07-10 11:30:32 +03:00
parent c984fc0881
commit 0f30e21312
3 changed files with 44 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwbase/world.hpp
View file

@ -184,6 +184,16 @@ namespace MWBase
virtual MWWorld::Ptr searchPtrViaActorId (int actorId) = 0; virtual MWWorld::Ptr searchPtrViaActorId (int actorId) = 0;
///< Search is limited to the active cells. ///< Search is limited to the active cells.
/*
Start of tes3mp addition
Make it possible to find a Ptr in any active cell based on its refNumIndex and mpNum
*/
virtual MWWorld::Ptr searchPtrViaRefIndex(int refNumIndex, int mpNum) = 0;
/*
End of tes3mp addition
*/
virtual MWWorld::Ptr findContainer (const MWWorld::ConstPtr& ptr) = 0; virtual MWWorld::Ptr findContainer (const MWWorld::ConstPtr& ptr) = 0;
///< Return a pointer to a liveCellRef which contains \a ptr. ///< Return a pointer to a liveCellRef which contains \a ptr.
/// \note Search is limited to the active cells. /// \note Search is limited to the active cells.

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

@ -729,6 +729,30 @@ namespace MWWorld
return mWorldScene->searchPtrViaActorId (actorId); return mWorldScene->searchPtrViaActorId (actorId);
} }
/*
Start of tes3mp addition
Make it possible to find a Ptr in any active cell based on its refNumIndex and mpNum
*/
Ptr World::searchPtrViaRefIndex(int refNumIndex, int mpNum)
{
for (Scene::CellStoreCollection::const_iterator iter(mWorldScene->getActiveCells().begin());
iter != mWorldScene->getActiveCells().end(); ++iter)
{
CellStore* cellStore = *iter;
MWWorld::Ptr ptrFound = cellStore->searchExact(refNumIndex, mpNum);
if (ptrFound)
return ptrFound;
}
return nullptr;
}
/*
End of tes3mp addition
*/
struct FindContainerVisitor struct FindContainerVisitor
{ {
ConstPtr mContainedPtr; ConstPtr mContainedPtr;

10
apps/openmw/mwworld/worldimp.hpp
View file

@ -291,6 +291,16 @@ namespace MWWorld
Ptr searchPtrViaActorId (int actorId) override; Ptr searchPtrViaActorId (int actorId) override;
///< Search is limited to the active cells. ///< Search is limited to the active cells.
/*
Start of tes3mp addition
Make it possible to find a Ptr in any active cell based on its refNumIndex and mpNum
*/
Ptr searchPtrViaRefIndex(int refNumIndex, int mpNum) override;
/*
End of tes3mp addition
*/
MWWorld::Ptr findContainer (const MWWorld::ConstPtr& ptr) override; MWWorld::Ptr findContainer (const MWWorld::ConstPtr& ptr) override;
///< Return a pointer to a liveCellRef which contains \a ptr. ///< Return a pointer to a liveCellRef which contains \a ptr.
/// \note Search is limited to the active cells. /// \note Search is limited to the active cells.