mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-05 17:49:42 +00:00
Code Issues Releases Wiki Activity

[Client] Use new exact search with ObjectActivate & ObjectDialogueChoice

Browse source
This commit is contained in:
David Cernat 2021-12-09 15:29:58 +02:00
parent 646ffc7afe
commit 1cb10cd1f2
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/openmw/mwmp/ObjectList.cpp
View file

@ -349,7 +349,14 @@ void ObjectList::activateObjects(MWWorld::CellStore* cellStore)
else
{
LOG_APPEND(TimedLog::LOG_VERBOSE, "-- Activated object is %s %i-%i", baseObject.refId.c_str(), baseObject.refNum, baseObject.mpNum);
ptrFound = cellStore->searchExact(baseObject.refNum, baseObject.mpNum);
if (baseObject.refId.empty())
{
ptrFound = cellStore->searchExact(baseObject.refNum, baseObject.mpNum);
}
else
{
ptrFound = cellStore->searchExactPlus(baseObject.refId, baseObject.refNum, baseObject.mpNum);
}
}
if (ptrFound)
@ -991,8 +998,16 @@ void ObjectList::makeDialogueChoices(MWWorld::CellStore* cellStore)
for (const auto& baseObject : baseObjects)
{
LOG_APPEND(TimedLog::LOG_VERBOSE, "- cellRef: %s %i-%i", baseObject.refId.c_str(), baseObject.refNum, baseObject.mpNum);
MWWorld::Ptr ptrFound;
MWWorld::Ptr ptrFound = cellStore->searchExact(baseObject.refNum, baseObject.mpNum);
if (baseObject.refId.empty())
{
ptrFound = cellStore->searchExact(baseObject.refNum, baseObject.mpNum);
}
else
{
ptrFound = cellStore->searchExactPlus(baseObject.refId, baseObject.refNum, baseObject.mpNum);
}
if (ptrFound)
{