From 4f73e8bb7184ebdc72cdc125e1513b5a562b5017 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 16 Jun 2014 00:52:40 +0200
Subject: [PATCH] Add items to player inventory upon drag start (Fixes #1507)

---
 apps/openmw/mwgui/container.cpp       | 26 ++++++++++++++++++++++++++
 apps/openmw/mwgui/inventorywindow.cpp |  5 +++++
 apps/openmw/mwgui/inventorywindow.hpp |  1 +
 3 files changed, 32 insertions(+)

diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index 4ba454a1ca..011feb4d35 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -38,6 +38,32 @@ namespace MWGui
         mIsOnDragAndDrop = true;
         mDragAndDropWidget->setVisible(true);
 
+        // If picking up an item that isn't from the player's inventory, the item gets added to player inventory backend
+        // immediately, even though it's still floating beneath the mouse cursor. A bit counterintuitive,
+        // but this is how it works in vanilla, and not doing so would break quests (BM_beasts for instance).
+        ItemModel* playerModel = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getModel();
+        if (mSourceModel != playerModel)
+        {
+            MWWorld::Ptr item = mSourceModel->moveItem(mItem, mDraggedCount, playerModel);
+
+            playerModel->update();
+
+            ItemModel::ModelIndex newIndex = -1;
+            for (unsigned int i=0; i<playerModel->getItemCount(); ++i)
+            {
+                if (playerModel->getItem(i).mBase == item)
+                {
+                    newIndex = i;
+                    break;
+                }
+            }
+            mItem = playerModel->getItem(newIndex);
+            mSourceModel = playerModel;
+
+            SortFilterItemModel* playerFilterModel = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getSortFilterModel();
+            mSourceSortModel = playerFilterModel;
+        }
+
         std::string sound = mItem.mBase.getClass().getUpSoundId(mItem.mBase);
         MWBase::Environment::get().getSoundManager()->playSound (sound, 1.0, 1.0);
 
diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index b1e8052d8c..abea68185d 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -132,6 +132,11 @@ namespace MWGui
         adjustPanes();
     }
 
+    SortFilterItemModel* InventoryWindow::getSortFilterModel()
+    {
+        return mSortModel;
+    }
+
     TradeItemModel* InventoryWindow::getTradeModel()
     {
         return mTradeModel;
diff --git a/apps/openmw/mwgui/inventorywindow.hpp b/apps/openmw/mwgui/inventorywindow.hpp
index df563b3d46..ae7af5719b 100644
--- a/apps/openmw/mwgui/inventorywindow.hpp
+++ b/apps/openmw/mwgui/inventorywindow.hpp
@@ -37,6 +37,7 @@ namespace MWGui
                 mPreview->rebuild();
             }
 
+            SortFilterItemModel* getSortFilterModel();
             TradeItemModel* getTradeModel();
             ItemModel* getModel();