From 6641fd463512a7b8b09cb7ef196d1e82e990fd06 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 21 Nov 2013 03:51:02 +0100
Subject: [PATCH] Fix bug when enchanting: only the mBase pointer was updated,
 not the CellRef mRefID, which is used for container stacking. The new
 (enchanted) item was stacking with the old item when it was added, so the
 enchantment completely disappears.

---
 apps/openmw/mwclass/armor.cpp    |  1 +
 apps/openmw/mwclass/book.cpp     |  1 +
 apps/openmw/mwclass/clothing.cpp |  1 +
 apps/openmw/mwclass/weapon.cpp   | 19 ++++++++++---------
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index c8e09d4333..f916c2fb73 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -281,6 +281,7 @@ namespace MWClass
         newItem.mEnchant=enchId;
         const ESM::Armor *record = MWBase::Environment::get().getWorld()->createRecord (newItem);
         ref->mBase = record;
+        ref->mRef.mRefID = record->mId;
     }
 
     std::pair<int, std::string> Armor::canBeEquipped(const MWWorld::Ptr &ptr, const MWWorld::Ptr &npc) const
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index a692b30d8f..b22cbc31fc 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -171,6 +171,7 @@ namespace MWClass
         newItem.mEnchant=enchId;
         const ESM::Book *record = MWBase::Environment::get().getWorld()->createRecord (newItem);
         ref->mBase = record;
+        ref->mRef.mRefID = record->mId;
     }
 
     boost::shared_ptr<MWWorld::Action> Book::use (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 0a23821a92..8941f36275 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -227,6 +227,7 @@ namespace MWClass
         newItem.mEnchant=enchId;
         const ESM::Clothing *record = MWBase::Environment::get().getWorld()->createRecord (newItem);
         ref->mBase = record;
+        ref->mRef.mRefID = record->mId;
     }
 
     std::pair<int, std::string> Clothing::canBeEquipped(const MWWorld::Ptr &ptr, const MWWorld::Ptr &npc) const
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index eaed597fcf..671e81dca0 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -370,16 +370,17 @@ namespace MWClass
 
     void Weapon::applyEnchantment(const MWWorld::Ptr &ptr, const std::string& enchId, int enchCharge, const std::string& newName) const
     {
-            MWWorld::LiveCellRef<ESM::Weapon> *ref =
-            ptr.get<ESM::Weapon>();
+        MWWorld::LiveCellRef<ESM::Weapon> *ref =
+        ptr.get<ESM::Weapon>();
 
-            ESM::Weapon newItem = *ref->mBase;
-            newItem.mId="";
-            newItem.mName=newName;
-            newItem.mData.mEnchant=enchCharge;
-            newItem.mEnchant=enchId;
-            const ESM::Weapon *record = MWBase::Environment::get().getWorld()->createRecord (newItem);
-            ref->mBase = record;
+        ESM::Weapon newItem = *ref->mBase;
+        newItem.mId="";
+        newItem.mName=newName;
+        newItem.mData.mEnchant=enchCharge;
+        newItem.mEnchant=enchId;
+        const ESM::Weapon *record = MWBase::Environment::get().getWorld()->createRecord (newItem);
+        ref->mBase = record;
+        ref->mRef.mRefID = record->mId;
     }
 
     std::pair<int, std::string> Weapon::canBeEquipped(const MWWorld::Ptr &ptr, const MWWorld::Ptr &npc) const