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

[Client] Rename searchPtrViaRefIndex into searchPtrViaUniqueIndex

Browse source
This commit is contained in:
David Cernat 2018-07-13 04:33:54 +03:00
parent 09da24f1ea
commit 6c1173d598
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -189,7 +189,7 @@ namespace MWBase
Make it possible to find a Ptr in any active cell based on its refNum and mpNum Make it possible to find a Ptr in any active cell based on its refNum and mpNum
*/ */
virtual MWWorld::Ptr searchPtrViaRefIndex(int refNum, int mpNum) = 0; virtual MWWorld::Ptr searchPtrViaUniqueIndex(int refNum, int mpNum) = 0;
/* /*
End of tes3mp addition End of tes3mp addition
*/ */

2
apps/openmw/mwmp/DedicatedActor.cpp
View file

@ -261,7 +261,7 @@ void DedicatedActor::setAi()
else if (mwmp::Main::get().getCellController()->isDedicatedActor(aiTarget.refNum, aiTarget.mpNum)) else if (mwmp::Main::get().getCellController()->isDedicatedActor(aiTarget.refNum, aiTarget.mpNum))
targetPtr = mwmp::Main::get().getCellController()->getDedicatedActor(aiTarget.refNum, aiTarget.mpNum)->getPtr(); targetPtr = mwmp::Main::get().getCellController()->getDedicatedActor(aiTarget.refNum, aiTarget.mpNum)->getPtr();
else if (aiAction == mwmp::BaseActorList::ACTIVATE) else if (aiAction == mwmp::BaseActorList::ACTIVATE)
targetPtr = MWBase::Environment::get().getWorld()->searchPtrViaRefIndex(aiTarget.refNum, aiTarget.mpNum); targetPtr = MWBase::Environment::get().getWorld()->searchPtrViaUniqueIndex(aiTarget.refNum, aiTarget.mpNum);
if (targetPtr) if (targetPtr)
{ {

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

@ -734,7 +734,7 @@ namespace MWWorld
Make it possible to find a Ptr in any active cell based on its refNum and mpNum Make it possible to find a Ptr in any active cell based on its refNum and mpNum
*/ */
Ptr World::searchPtrViaRefIndex(int refNum, int mpNum) Ptr World::searchPtrViaUniqueIndex(int refNum, int mpNum)
{ {
for (Scene::CellStoreCollection::const_iterator iter(mWorldScene->getActiveCells().begin()); for (Scene::CellStoreCollection::const_iterator iter(mWorldScene->getActiveCells().begin());
iter != mWorldScene->getActiveCells().end(); ++iter) iter != mWorldScene->getActiveCells().end(); ++iter)

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

@ -296,7 +296,7 @@ namespace MWWorld
Make it possible to find a Ptr in any active cell based on its refNum and mpNum Make it possible to find a Ptr in any active cell based on its refNum and mpNum
*/ */
Ptr searchPtrViaRefIndex(int refNum, int mpNum) override; Ptr searchPtrViaUniqueIndex(int refNum, int mpNum) override;
/* /*
End of tes3mp addition End of tes3mp addition
*/ */