From 9485aa5e44dfb1cec74f2d36156fbd7e5b3251ed Mon Sep 17 00:00:00 2001
From: Koncord <koncord@rwa.su>
Date: Mon, 20 Jul 2015 09:53:08 +0900
Subject: [PATCH] Fix "removeitem gold_100" behavior

---
 apps/openmw/mwworld/containerstore.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 9d4ec552e..c21fdd662 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -362,8 +362,18 @@ int MWWorld::ContainerStore::remove(const std::string& itemId, int count, const
 {
     int toRemove = count;
 
+    std::string id = itemId;
+    
+    if(Misc::StringUtils::ciEqual(itemId, "gold_005")
+            || Misc::StringUtils::ciEqual(itemId, "gold_010")
+            || Misc::StringUtils::ciEqual(itemId, "gold_025")
+            || Misc::StringUtils::ciEqual(itemId, "gold_100"))
+    {
+        id = MWWorld::ContainerStore::sGoldId;
+    }
+
     for (ContainerStoreIterator iter(begin()); iter != end() && toRemove > 0; ++iter)
-        if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), itemId))
+        if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), id))
             toRemove -= remove(*iter, toRemove, actor);
 
     flagAsModified();