From 8591935a4b48c24a16e8c103d474ee6803ce56a0 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Sat, 13 Dec 2014 18:49:11 +0100
Subject: Implemented vanilla-like shift click. This fixes many visual bugs.

---
 src/UI/InventoryWindow.h | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

(limited to 'src/UI/InventoryWindow.h')

diff --git a/src/UI/InventoryWindow.h b/src/UI/InventoryWindow.h
index af44dec98..a6ea7c793 100644
--- a/src/UI/InventoryWindow.h
+++ b/src/UI/InventoryWindow.h
@@ -30,6 +30,50 @@ public:
 		m_SlotAreas.push_back(new cSlotAreaInventory(*this));
 		m_SlotAreas.push_back(new cSlotAreaHotBar(*this));
 	}
+
+
+	virtual void DistributeStack(cItem & a_ItemStack, int a_Slot, cPlayer & a_Player, cSlotArea * a_ClickedArea, bool a_ShouldApply) override
+	{
+		cSlotAreas AreasInOrder;
+
+		if (a_ClickedArea == m_SlotAreas[0])
+		{
+			// Crafting Area
+			if (a_Slot == 0)
+			{
+				// Result Slot
+				AreasInOrder.push_back(m_SlotAreas[3]);  /* Hotbar    */
+				AreasInOrder.push_back(m_SlotAreas[2]);  /* Inventory */
+			}
+			else
+			{
+				AreasInOrder.push_back(m_SlotAreas[2]);  /* Inventory */
+				AreasInOrder.push_back(m_SlotAreas[3]);  /* Hotbar    */
+			}
+			super::DistributeStack(a_ItemStack, a_Player, AreasInOrder, a_ShouldApply, (a_Slot == 0));
+		}
+		else if (a_ClickedArea == m_SlotAreas[1])
+		{
+			// Armor Area
+			AreasInOrder.push_back(m_SlotAreas[2]);  /* Inventory */
+			AreasInOrder.push_back(m_SlotAreas[3]);  /* Hotbar    */
+			super::DistributeStack(a_ItemStack, a_Player, AreasInOrder, a_ShouldApply, false);
+		}
+		else if (a_ClickedArea == m_SlotAreas[2])
+		{
+			// Inventory Area
+			AreasInOrder.push_back(m_SlotAreas[1]);  /* Armor  */
+			AreasInOrder.push_back(m_SlotAreas[3]);  /* Hotbar */
+			super::DistributeStack(a_ItemStack, a_Player, AreasInOrder, a_ShouldApply, false);
+		}
+		else
+		{
+			// Hotbar
+			AreasInOrder.push_back(m_SlotAreas[1]);  /* Armor     */
+			AreasInOrder.push_back(m_SlotAreas[2]);  /* Inventory */
+			super::DistributeStack(a_ItemStack, a_Player, AreasInOrder, a_ShouldApply, false);
+		}
+	}
 	
 protected:
 	cPlayer & m_Player;
-- 
cgit v1.2.3