From 9b72a6ac69ddd4b282ff3c9ed46ca4d8b7cde44c Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 27 Nov 2017 13:00:14 +0400
Subject: [PATCH] Use the MWWorld::Ptr() instead of string ID

---
 apps/openmw/mwmechanics/actors.cpp | 23 +++++++++++++++--------
 apps/openmw/mwmechanics/actors.hpp |  2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 10e9b7afc..76c5744b3 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -264,7 +264,7 @@ namespace MWMechanics
             if (slot == MWWorld::InventoryStore::Slot_CarriedRight)
                 MWBase::Environment::get().getWorld()->getPlayer().setDrawState(MWMechanics::DrawState_Weapon);
 
-            mPreviousItems[slot] = std::make_pair(itemId, prevItem.isEmpty() ? "" : prevItem.getCellRef().getRefId());
+            mPreviousItems[slot] = std::make_pair(itemId, prevItem);
         }
         else
         {
@@ -275,21 +275,28 @@ namespace MWMechanics
 
             int slot = getBoundItemSlot(itemId);
 
-            std::pair<std::string, std::string> prevItem = mPreviousItems[slot];
+            std::pair<std::string, MWWorld::Ptr> prevItem = mPreviousItems[slot];
 
             if (prevItem.first != itemId)
                 return;
 
-            MWWorld::Ptr ptr = MWWorld::Ptr();
-            if (prevItem.second != "")
-                ptr = store.search (prevItem.second);
-
             mPreviousItems.erase(slot);
 
-            if (ptr.isEmpty())
+            if (prevItem.second.isEmpty())
+                return;
+
+            // check if the item is still in the player's inventory
+            MWWorld::ContainerStoreIterator it = store.begin();
+            for (; it != store.end(); ++it)
+            {
+                if (*it == prevItem.second)
+                    break;
+            }
+
+            if (it == store.end())
                 return;
 
-            MWWorld::ActionEquip action(ptr);
+            MWWorld::ActionEquip action(prevItem.second);
             action.execute(actor);
         }
     }
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index f0e157db1..40e9e1d21 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -25,7 +25,7 @@ namespace MWMechanics
     class Actors
     {
             std::map<std::string, int> mDeathCount;
-            typedef std::map<int, std::pair<std::string, std::string>> PreviousItems;
+            typedef std::map<int, std::pair<std::string, MWWorld::Ptr>> PreviousItems;
             PreviousItems mPreviousItems;
 
             void adjustBoundItem (const std::string& itemId, bool bound, const MWWorld::Ptr& actor);