[Client] Use new exact search with ObjectActivate & ObjectDialogueChoice

apps/openmw/mwmp/ObjectList.cpp

@@ -349,8 +349,15 @@ 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);
+            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)
         {