From 6c1173d598ad1d29a9d105c4d2dc4d8db7664a74 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Fri, 13 Jul 2018 04:33:54 +0300 Subject: [PATCH] [Client] Rename searchPtrViaRefIndex into searchPtrViaUniqueIndex --- apps/openmw/mwbase/world.hpp | 2 +- apps/openmw/mwmp/DedicatedActor.cpp | 2 +- apps/openmw/mwworld/worldimp.cpp | 2 +- apps/openmw/mwworld/worldimp.hpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp index 52e870420..7c2a612a3 100644 --- a/apps/openmw/mwbase/world.hpp +++ b/apps/openmw/mwbase/world.hpp @@ -189,7 +189,7 @@ namespace MWBase 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 */ diff --git a/apps/openmw/mwmp/DedicatedActor.cpp b/apps/openmw/mwmp/DedicatedActor.cpp index 33ac0a43c..29788317b 100644 --- a/apps/openmw/mwmp/DedicatedActor.cpp +++ b/apps/openmw/mwmp/DedicatedActor.cpp @@ -261,7 +261,7 @@ void DedicatedActor::setAi() else if (mwmp::Main::get().getCellController()->isDedicatedActor(aiTarget.refNum, aiTarget.mpNum)) targetPtr = mwmp::Main::get().getCellController()->getDedicatedActor(aiTarget.refNum, aiTarget.mpNum)->getPtr(); 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) { diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp index ed932ef0b..ccc9d15b2 100644 --- a/apps/openmw/mwworld/worldimp.cpp +++ b/apps/openmw/mwworld/worldimp.cpp @@ -734,7 +734,7 @@ namespace MWWorld 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()); iter != mWorldScene->getActiveCells().end(); ++iter) diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp index 589c44ae9..630c3b222 100644 --- a/apps/openmw/mwworld/worldimp.hpp +++ b/apps/openmw/mwworld/worldimp.hpp @@ -296,7 +296,7 @@ namespace MWWorld 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 */